修改门店对应快递信息和添加快递类型 和修改商品查询bug

kmall-admin/src/main/java/com/kmall/admin/entity/AddressInfoEntity.java

@@ -31,6 +31,10 @@ public class AddressInfoEntity implements Serializable {
      */
     private Integer isValid;
     /**
+     * 快递类型编号
+     */
+    private String exprTypeId;
+    /**
      * 创建人编号
      */
     private String createrSn;
@@ -108,6 +112,18 @@ public class AddressInfoEntity implements Serializable {
     public Integer getIsValid() {
         return isValid;
     }
+    /**
+     * 快递类型编号
+     */
+    public String getExprTypeId() {
+        return exprTypeId;
+    }
+    /**
+     * 快递类型编号
+     */
+    public void setExprTypeId(String exprTypeId) {
+        this.exprTypeId = exprTypeId;
+    }
 
     /**
      * 创建人编号

kmall-admin/src/main/java/com/kmall/admin/entity/ShopAndAddrVo.java

@@ -13,6 +13,12 @@ public class ShopAndAddrVo implements Serializable {
      */
     private String exprId;
 
+    /**
+     *
+     * @return
+     */
+    private String exprTypeId;
+
     public String getOutletsId() {
         return outletsId;
     }
@@ -28,4 +34,12 @@ public class ShopAndAddrVo implements Serializable {
     public void setExprId(String exprId) {
         this.exprId = exprId;
     }
+
+    public String getExprTypeId() {
+        return exprTypeId;
+    }
+
+    public void setExprTypeId(String exprTypeId) {
+        this.exprTypeId = exprTypeId;
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/AddressInfoServiceImpl.java

@@ -64,6 +64,7 @@ public class AddressInfoServiceImpl implements AddressInfoService {
     public int save(ShopAndAddrVo shopAndAddrVo) {
         int exprId = Integer.parseInt(shopAndAddrVo.getExprId());
         int outletsId = Integer.parseInt(shopAndAddrVo.getOutletsId());
+        String exprTypeId = shopAndAddrVo.getExprTypeId();
         AddressInfoEntity addressInfo = addressInfoDao.queryIds(outletsId + "", exprId + "");
         if (addressInfo!=null) {
             throw new RRException("该门店已选择快递公司,不能重复添加！");
@@ -71,6 +72,7 @@ public class AddressInfoServiceImpl implements AddressInfoService {
         addressInfo =new AddressInfoEntity();
         addressInfo.setCourieId(exprId);
         addressInfo.setStoreId(outletsId);
+        addressInfo.setExprTypeId(exprTypeId);
         addressInfo.setIsValid(0);
         SysUserEntity sysUserEntity = ShiroUtils.getUserEntity();
         addressInfo.setCreaterSn(sysUserEntity.getUsername());

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -1835,7 +1835,8 @@ public class GoodsServiceImpl implements GoodsService {
             topicList.add(mkActivitiesEntity.getMkaTopic());
             String mkaId = mkaIdMap.putIfAbsent(mkActivitiesEntity.getMkaTopic(), mkActivitiesEntity.getMkaId()+"");
             if(StringUtils.isNotEmpty(mkaId)){
-                mkaId = "'"+mkaId + "','" + mkActivitiesEntity.getMkaId()+"'";
+//                mkaId = "'"+mkaId + "','" + mkActivitiesEntity.getMkaId()+"'";
+                mkaId += String.format(",%s",mkActivitiesEntity.getMkaId());
                 mkaIdMap.put(mkActivitiesEntity.getMkaTopic(),mkaId);
             }
         }

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -2153,29 +2153,29 @@ public class OrderServiceImpl implements OrderService {
             // 设置支付单开始时间
             processRecordEntity.setPaymentStartTime(new Date());
             // 判断是微信的支付码还是支付宝的支付码
-            if (parCode.startsWith("28")) {
-                // 支付宝支付
-                try {
-                    AliPay(user, parCode, order, processRecordEntity, orderWXPayRecordCurrent, store);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    throw e;
-                }
-            } else {
-                // 微信支付
-                try {
-                    wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    throw e;
-                }
-            }
+//            if (parCode.startsWith("28")) {
+//                // 支付宝支付
+//                try {
+//                    AliPay(user, parCode, order, processRecordEntity, orderWXPayRecordCurrent, store);
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                    throw e;
+//                }
+//            } else {
+//                // 微信支付
+//                try {
+//                    wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                    throw e;
+//                }
+//            }
 
-//            OrderEntity orderEntity = queryObject(order.getId());
-////             TODO 到时候要注释掉，测试用而已
-//            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
-//            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
-//            orderDao.update(orderEntity);
+            ////             TODO 到时候要注释掉，测试用而已
+            OrderEntity orderEntity = queryObject(order.getId());
+            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
+            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
+            orderDao.update(orderEntity);
             resultObj.put("shopName", store.getStoreName()); // 根据门店编号查询
             resultObj.put("userName", user.getUsername());
 

kmall-admin/src/main/resources/mybatis/mapper/shop/AddressInfoDao.xml

@@ -7,6 +7,7 @@
         <result property="id" column="id"/>
         <result property="storeId" column="store_id"/>
         <result property="courieId" column="courie_id"/>
+        <result property="exprTypeId" column="exprtype_id"/>
 		<result property="isValid" column="is_valid"/>
 		<result property="createrSn" column="creater_sn"/>
 		<result property="createTime" column="create_time"/>
@@ -20,6 +21,7 @@
 			`id`,
 			`store_id`,
 			`courie_id`,
+			`exprtype_id`,
 			`is_valid`,
 			`creater_sn`,
 			`create_time`,
@@ -113,12 +115,14 @@
 		insert into mall2_express_address_info(
 			`store_id`,
 			`courie_id`,
+			`exprtype_id`,
 			`is_valid`,
 			`creater_sn`,
 			`create_time`)
 		values(
 			#{storeId},
 			#{courieId},
+			#{exprTypeId},
 			#{isValid},
 			#{createrSn},
 			#{createTime}
@@ -130,6 +134,7 @@
 		<set>
 			<if test="storeId != null">`store_id` = #{storeId}, </if>
 			<if test="courieId != null">`courie_id` = #{courieId},</if>
+			<if test="exprTypeId != null">`exprTypeId` = #{exprTypeId},</if>
 			<if test="isValid != null">`is_valid` = #{isValid}, </if>
 			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
 			<if test="createTime != null">`create_time` = #{createTime}, </if>

kmall-admin/src/main/webapp/WEB-INF/page/shop/addressinfo.html

@@ -36,11 +36,11 @@
         <p slot="title">{{title}}</p>
 		<i-form ref="formValidate" :model="addressInfo" :rules="ruleValidate" :label-width="80">
             <div v-if="status == 1">
-                <Form-item label="商家编号" prop="storeName">
-                    <i-input v-model="addressInfo.storeName" placeholder="商家编号" readonly="readonly"/>
+                <Form-item label="门店名称" prop="storeName">
+                    <i-input v-model="addressInfo.storeName" placeholder="门店名称" readonly="readonly"/>
                 </Form-item>
-                <Form-item label="快递编号" prop="expressName">
-                    <i-input v-model="addressInfo.expressName" placeholder="快递编号" readonly="readonly"/>
+                <Form-item label="快递名称" prop="expressName">
+                    <i-input v-model="addressInfo.expressName" placeholder="快递名称" readonly="readonly"/>
                 </Form-item>
                 <Form-item label="是否启用" prop="isValid">
                     <Radio-group v-model="addressInfo.isValid">
@@ -59,16 +59,21 @@
                 </Form-item>
             </div>
             <div v-if="status == 2">
-                <Form-item label="快递公司" prop="expcomId">
-                    <i-select v-model="addressInfo.expcomId" placeholder="快递公司名称" label-in-value>
-                        <i-option v-for="expcom in expressCompanySys" :value="expcom.id" :key="expcom.id">{{expcom.expressName}}</i-option>
-                    </i-select>
-                </Form-item>
                 <Form-item label="门店名称" prop="storeId">
                     <i-select v-model="addressInfo.storeId" placeholder="门店名称" label-in-value>
                         <i-option v-for="store in storeList" :value="store.id" :key="store.id">{{store.storeName}}</i-option>
                     </i-select>
                 </Form-item>
+                <Form-item label="快递名称" prop="expcomId">
+                    <i-select v-model="addressInfo.expcomId" placeholder="快递名称" label-in-value>
+                        <i-option v-for="expcom in expressCompanySys" :value="expcom.id" :key="expcom.id">{{expcom.expressName}}</i-option>
+                    </i-select>
+                </Form-item>
+                <Form-item label="快递类型" prop="exprTypeId">
+                    <i-select v-model="addressInfo.exprTypeId" placeholder="快递类型" label-in-value>
+                        <i-option v-for="mct in machineCodeTypes" :value="mct.value" :key="mct.value">{{mct.name}}</i-option>
+                    </i-select>
+                </Form-item>
                 <Form-item>
                     <i-button type="primary" @click="handleComSubmit('formValidate')">提交</i-button>
                     <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

kmall-admin/src/main/webapp/js/shop/addressinfo.js

@@ -4,7 +4,7 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '商家名称', name: 'storeName', index: 'store_name', width: 80},
+			{label: '门店名称', name: 'storeName', index: 'store_name', width: 80},
 			{label: '快递名称', name: 'expressName', index: 'express_name', width: 80},
 			{label: '是否启用', name: 'isValid', index: 'is_valid', width: 80,
 				formatter: function (value) {
@@ -55,10 +55,12 @@ let vm = new Vue({
         title: null,
 		storeId: '',
 		expcomId:'',
+		exprTypeId:'',
 		status:'',
 		addressInfo: {},
 		storeList: [],
 		expressCompanySys:[],
+		machineCodeTypes:[],
 		ruleValidate: {
 			/*storeId: [
 				{required: true, message: '门店不能为空', trigger: 'blur'}
@@ -81,9 +83,11 @@ let vm = new Vue({
 			vm.addressInfo = {};
 			vm.storeList = [];
 			vm.expressCompanySys=[];
+			vm.machineCodeTypes=[];
 			vm.status=2;
 			vm.getStoresByMerch();
 			vm.getCompantByThirdMerch();
+			vm.mounted();
 		},
 		update: function (event) {
             let id = getSelectedRow();
@@ -151,7 +155,8 @@ let vm = new Vue({
 			let url = "../addressinfo/saveStoreAndComp";
 			let storesId = vm.addressInfo.storeId;
 			let expcomId = vm.addressInfo.expcomId;
-			let pames={"outletsId":storesId,"exprId":expcomId};
+			let exprTypeId = vm.addressInfo.exprTypeId;
+			let pames={"outletsId":storesId,"exprId":expcomId,"exprTypeId":exprTypeId};
 			console.log(JSON.stringify(pames));
 			$.ajax({
 				type: "POST",
@@ -210,6 +215,11 @@ let vm = new Vue({
                 vm.addressInfo = r.addressInfo;
             });
 		},
+		mounted() {
+			$.get("../sys/macro/queryMacrosByValue?value=exprType", function (r) {
+				vm.machineCodeTypes = r.list;
+			});
+		},
         reloadSearch: function() {
             vm.q = {
 				storeId: ''