Merge branch 'master' of http://git.minpay.cc/shouhuobang/adm

 Conflicts:

	src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml

src/main/java/com/minpay/shouhuo/invCardManageAction.java

@@ -3,15 +3,22 @@ package com.minpay.shouhuo;
 import com.minpay.common.bean.User;
 import com.minpay.common.format.IFormatService;
 import com.minpay.common.service.ILogService;
+import com.minpay.common.service.IPropertiesService;
 import com.minpay.common.util.CommonUtil;
 import com.minpay.common.util.DateUtil;
+import com.minpay.common.util.HttpPostUtil;
+import com.minpay.db.table.mapper.VmDeliveryInfMapper;
+import com.minpay.db.table.mapper.VmOrderDetailsMapper;
 import com.minpay.db.table.mapper.VmOrderInfMapper;
+import com.minpay.db.table.model.VmDeliveryInf;
+import com.minpay.db.table.model.VmOrderDetails;
 import com.minpay.db.table.model.VmOrderInf;
 import com.minpay.db.table.own.mapper.OrderManageMapper;
 import com.startup.minpay.frame.business.IMINAction;
 import com.startup.minpay.frame.business.res.MINActionResult;
 import com.startup.minpay.frame.constant.IMINBusinessConstant;
 import com.startup.minpay.frame.data.format.MINCopyFormat;
+import com.startup.minpay.frame.exception.MINBusinessException;
 import com.startup.minpay.frame.jdbc.MINRowBounds;
 import com.startup.minpay.frame.service.base.IMINDataBaseService;
 import com.startup.minpay.frame.service.base.Service;
@@ -19,6 +26,7 @@ import com.startup.minpay.frame.session.MINSession;
 import com.startup.minpay.frame.target.MINAction;
 import com.startup.minpay.frame.target.MINComponent;
 import com.startup.minpay.frame.target.MINParam;
+import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 
 import java.math.BigDecimal;
@@ -350,7 +358,7 @@ public class invCardManageAction implements IMINAction {
 		detailList = Service.lookup(IFormatService.class).formatDateTime(detailList, "pickUpTime");
 		detailList = Service.lookup(IFormatService.class).formatDateTime(detailList, "createTime");
 		detailList = new MINCopyFormat("{stt:'sttDesc'}").format(detailList);
-		detailList = Service.lookup(IFormatService.class).formatEnum(detailList,"{sttDesc:'PICKUP_STT'}");
+		detailList = Service.lookup(IFormatService.class).formatEnum(detailList,"{sttDesc:'ORDER_PICKUP_STT'}");
 		//返回数据
 		res.set(IMINBusinessConstant.F_PAGING_LAY, detailList);
 		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getMaxRows());
@@ -370,24 +378,65 @@ public class invCardManageAction implements IMINAction {
 	public MINActionResult updateOrderStt(
 			@MINParam ( key = "orderNo")String orderNo,
 			@MINParam ( key = "temp")String temp,
+			@MINParam ( key = "pickupNo")String pickupNo,
+			@MINParam ( key = "detailsId")String detailsId,
 			MINSession session) throws Exception{
 		MINActionResult res = new MINActionResult();
 		User user = session.getUser();
+		VmDeliveryInf vd = Service.lookup(IMINDataBaseService.class)
+									.getMybatisMapper(VmDeliveryInfMapper.class)
+									.selectByPrimaryKey(pickupNo);
+		if(vd == null || "2".equals(vd.getStatus()) || "6".equals(vd.getStatus())){
+			throw new MINBusinessException("提货编号已提货");
+		}
+		String ordDetId = vd.getOrdDetId();
+		VmOrderDetails vmOrderDetails = Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(VmOrderDetailsMapper.class)
+				.selectByPrimaryKey(ordDetId);
+		if(vmOrderDetails == null||"01".equals(vmOrderDetails.getIsDelivery())){
+			throw new MINBusinessException("提货编号已提货");
+		}
+
 		String info = "";
-		//更新订单状态
-		VmOrderInf vd = new VmOrderInf();
-		vd.setId(orderNo);
 		if ("0".equals(temp)) {
-			vd.setPickupStt("02");
+			vd.setStatus("6");
 			info = "废止";
+			//修改提货表
+			Service.lookup(IMINDataBaseService.class)
+					.getMybatisMapper(VmDeliveryInfMapper.class)
+					.updateByPrimaryKeySelective(vd);
+			//修改订单详情表
+			vmOrderDetails.setIsDelivery("01");
+			Service.lookup(IMINDataBaseService.class)
+					.getMybatisMapper(VmOrderDetailsMapper.class)
+					.updateByPrimaryKeySelective(vmOrderDetails);
+
 		}else if("1".equals(temp)) {
-			vd.setPickupStt("01");
+            String url = Service.lookup(IPropertiesService.class)
+                    .getSystemProperties().get("V01_SHOUHUO_NOTIFY_URL").getKey();
+			StringBuffer paramStr = new StringBuffer();
+
+			paramStr.append("MINView=JSON&");
+			paramStr.append("deliveryNo=");
+			paramStr.append(pickupNo);
+			url = url.concat("/DeliveryAction/makeDeliveryForMachineNoSession?");
+			String jsonObj = HttpPostUtil.sendPost(url, paramStr.toString());
+			if(CommonUtil.isEmpty(jsonObj)){
+				throw new MINBusinessException("操作失败！请重新操作");
+			}
+			JSONObject js2 = JSONObject.fromObject(jsonObj);
+			String mINStatus = js2.getString("MINStatus");
+			String mINErrorMessage = js2.getString("MINErrorMessage");
+			//{"msg":"没有提货信息!","code":1,"MINPage":{"charset":"UTF-8","cache":false,"view":"JSON","page":"","type":"","contentType":"text/html"},"MINLangLocale":"zh_CN","MINStatus":1,"MINTime":"2020-12-13 01:41:56","MINErrorMessage":"没有提货信息!"}
+			if(!"0".equals(mINStatus)){
+				throw new MINBusinessException(mINErrorMessage);
+			}
+			//发送请求
 			info = "发货";
 		}
-		Service.lookup(IMINDataBaseService.class)
-				.updateByPrimaryKeySelective(VmOrderInfMapper.class, vd);
+
 		//日志
-		String logInfo = user.getName()+"-更新订单状态:" +info+ ",订单号"+orderNo;
+		String logInfo = user.getName()+"-更新提货单状态:" +info+ ",订单号"+pickupNo;
 		Service.lookup(ILogService.class).logging(session, logInfo);
 		return res;
 	}

src/main/webapp/admin/invCardManage/invCardManage.html

@@ -88,7 +88,7 @@
   			}
 		});
 		form = layui.form;
-		initSelect('pickUpState', "PICKUP_STT", "pickUpState", ' ', true);
+		initSelect('pickUpState', "ORDER_PICKUP_STT", "pickUpState", ' ', true);
 		form.on('select(pickUpState)', function(data){
    			changeSelectCon(3, data.elem, "sel","pickUpState");
    		});
@@ -108,7 +108,7 @@
 		    ,page: true //开启分页
 		    ,cols: [[ //表头
 				{type:'numbers',title: '序号',width:'5%'}
-				,{field: 'orderNo', title: '订单号', width:'10%'}
+				,{field: 'detailsId', title: '订单号', width:'10%'}
 		      	,{field: 'productName', title: '商品信息', width:'12%'}
 		      	,{field: 'sallPrice', title: '商品价格', width:'12%'}
 		      	,{field: 'imeiAddr', title: '机台号', width:'12%'}
@@ -149,13 +149,17 @@
 		table.on('tool(tableFilter)', function(obj){ //注：tool是工具条事件名，tableFilter是table原始容器的属性 lay-filter="对应的值"
 			var data = obj.data; //获得当前行数据
 		    var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            var pickupNo = data.pickupNo;
+            var detailsId = data.detailsId;
 		    if(layEvent == 'doTovoid'){ //作废
 		    	layer.confirm('确定要作废订单吗?', function(index){
 					$.request({
 						action : '../../invCardManageAction/updateOrderStt',
 						data : {
-							orderNo : orderNo, //订单号
+                            detailsId : detailsId,
+                            pickupNo : pickupNo, //取货码
 							temp : "0" //操作0：作废，1：取货
+
 						},
 						success : function(data) {
 							 layer.alert('操作成功!', {
@@ -176,7 +180,8 @@
 					$.request({
 						action : '../../invCardManageAction/updateOrderStt',
 						data : {
-							orderNo : orderNo, //订单号
+                            detailsId : detailsId,
+                            pickupNo : pickupNo, //取货码
 							temp : "1" //操作0：作废，1：取货
 						},
 						success : function(data) {
@@ -186,11 +191,11 @@
 							});
 						},
 						error : function(data) {
-							 layer.alert('操作失败!', {
-								icon: 5,
-								title: "提示"
-							});
-						}
+                            layer.alert(data.MINErrorMessage, {
+                                icon: 5,
+                                title: "提示"
+                            });
+                        }
 					});
 				});
 			}

src/main/webapp/admin/pickupRecordManage/pickupRecord.html

@@ -85,10 +85,10 @@
                 ,cols: [[ //表头
                     {type:'numbers',title: '序号',width:'5%'}
                     ,{field: 'vciId', title: '用户ID', width:'12%'}
-                    ,{field: 'orderNo', title: '订单号', width:'12%'}
-                    ,{field: 'equrelId', title: '货道号', width:'15%'}
+                    ,{field: 'detailsId', title: '订单号', width:'12%'}
+                    ,{field: 'aisle', title: '货道号', width:'15%'}
                     ,{field: 'imeiAddr', title: '机台号', width:'10%', sort: true}
-                    ,{field: 'aislereLoadFun', title: '取货码',width:'8%'}
+                    ,{field: 'detailsId', title: '取货码',width:'8%'}
                     ,{field: 'productName', title: '商品信息', width:'12%'}
                     ,{field: 'sallPrice', title: '商品价格', width:'12%'}
                     ,{field: 'sttDesc', title: '状态', width:'12%'}

src/main/webapp/admin/salesDataManage/salesData.html

@@ -4,6 +4,10 @@
     <meta charset="utf-8">
     <title>销售数据</title>
     <script src="../../js/min-loader-next.js"></script>
+    <style type="text/css">
+        .layui-table-cell{height:60px;line-height:60px}
+        img{width:auto;height:auto;max-width:100%;max-height:100%;},
+    </style>
 </head>
 <body class="content">
 <div class="order-body">