门店新增第三方商户逻辑

kmall-admin/src/main/java/com/kmall/admin/controller/StoreController.java

@@ -1,13 +1,11 @@
 package com.kmall.admin.controller;
 
+import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.entity.StoreEntity;
 import com.kmall.admin.service.StoreService;
 import com.kmall.admin.utils.ParamUtils;
 import com.kmall.common.entity.SysUserEntity;
-import com.kmall.common.utils.PageUtils;
-import com.kmall.common.utils.Query;
-import com.kmall.common.utils.R;
-import com.kmall.common.utils.ShiroUtils;
+import com.kmall.common.utils.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -68,6 +66,26 @@ public class StoreController {
     @RequiresPermissions("store:save")
     @ResponseBody
     public R save(@RequestBody StoreEntity store) {
+        SysUserEntity user = ShiroUtils.getUserEntity();
+        if(user == null) {
+            return R.error("用户登录超时，请重新登录");
+        }
+        if (user.getRoleType().equalsIgnoreCase("2")) {
+            return R.error("当前用户角色为【店员】，店员不能新增其他门店信息");
+        }
+        Map<String, Object> valideDate = MapBeanUtil.fromObject(store);
+        ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
+        builder.put("merchSn", "商户");
+        builder.put("storeName", "门店名称");
+        builder.put("storeNumber", "门店编号");
+        builder.put("thirdPartyMerchCode", "第三方商户编号");
+        builder.put("thirdPartyMerchName", "第三方商户名称");
+        builder.put("latitude", "纬度");
+        builder.put("longitude", "经度");
+        R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+        if (Integer.valueOf(r.get("code").toString()) != 0) {
+            throw new RRException(r.get("msg").toString());
+        }
         storeService.save(store);
 
         return R.ok();

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

@@ -74,6 +74,25 @@ public class StoreEntity implements Serializable {
 
     private Date tstm;
 
+    private String thirdPartyMerchCode;
+    private String thirdPartyMerchName;
+
+    public String getThirdPartyMerchCode() {
+        return thirdPartyMerchCode;
+    }
+
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode) {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchName() {
+        return thirdPartyMerchName;
+    }
+
+    public void setThirdPartyMerchName(String thirdPartyMerchName) {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
     public Date getTstm() {
         return tstm;
     }

kmall-admin/src/main/resources/conf/wx-global.properties

@@ -10,9 +10,9 @@ wx.global.dev.appId=wxb6b30b1b14ee502a
 #小程序密钥
 wx.global.dev.secret=be0234dbbbde4ce68df43dd2b5e4c7b1
 #商户号
-wx.global.dev.mchId=
+wx.global.dev.mchId=103106626
 #支付签名
-wx.global.dev.paySignKey=
+wx.global.dev.paySignKey=CAXRUxp7mzgc1LhOMezsvS3PXbqi7KhY
 #交易类型
 wx.global.dev.tradeType=JSAPI
 #商户币种
@@ -43,7 +43,6 @@ wx.global.dev.ratequery=https://api.mch.weixin.qq.com/pay/queryexchagerate
 wx.global.dev.spbillCreateIp=127.0.0.1
 
 
-
 #========== 生产环境 ==========
 
 #小程序ID
@@ -51,9 +50,9 @@ wx.global.prod.appId=wxb6b30b1b14ee502a
 #小程序密钥
 wx.global.prod.secret=be0234dbbbde4ce68df43dd2b5e4c7b1
 #商户号
-wx.global.prod.mchId=
+wx.global.prod.mchId=103106626
 #支付签名
-wx.global.prod.paySignKey=
+wx.global.prod.paySignKey=CAXRUxp7mzgc1LhOMezsvS3PXbqi7KhY
 #交易类型
 wx.global.prod.tradeType=JSAPI
 #商户币种

kmall-admin/src/main/resources/mybatis/mapper/StoreDao.xml

@@ -22,6 +22,9 @@
 		<result column="moder_sn" property="moderSn"/>
 		<result column="mod_time" property="modTime"/>
 		<result column="tstm" property="tstm"/>
+
+		<result property="thirdPartyMerchCode" column="third_party_merch_code"/>
+		<result property="thirdPartyMerchName" column="third_party_merch_name"/>
     </resultMap>
 
 	<select id="queryObject" resultType="com.kmall.admin.entity.StoreEntity">
@@ -38,7 +41,7 @@
 			`latitude`,
 			`longitude`,
 			`cover_radius`,
-			`remark`,merch_sn, merch_name, creater_sn, create_time,
+			`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
 		moder_sn, mod_time, tstm
 		from mall_store
 		where id = #{id}
@@ -58,7 +61,7 @@
 		`latitude`,
 		`longitude`,
 		`cover_radius`,
-		`remark`,merch_sn, merch_name, creater_sn, create_time,
+		`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
     moder_sn, mod_time, tstm
 		from mall_store
 		where store_name = #{storeName}
@@ -78,7 +81,7 @@
     		`latitude`,
     		`longitude`,
     		`cover_radius`,
-    		`remark`,merch_sn, merch_name, creater_sn, create_time,
+    		`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
 		moder_sn, mod_time, tstm
 		from mall_store
 		WHERE 1=1
@@ -138,6 +141,8 @@
 			`longitude`,
 			`cover_radius`,
 			`remark`,
+			third_party_merch_code,
+			third_party_merch_name,
 			creater_sn,
 			create_time,
 			moder_sn,
@@ -156,6 +161,8 @@
 			#{longitude},
 			#{coverRadius},
 			#{remark},
+			#{thirdPartyMerchCode},
+			#{thirdPartyMerchName},
 			#{createrSn},
 			#{createTime},
 			#{moderSn},
@@ -180,6 +187,8 @@
 			<if test="remark != null">`remark` = #{remark},</if>
 			<if test="createrSn != null" >creater_sn = #{createrSn},</if>
 			<if test="createTime != null" >create_time = #{createTime},</if>
+			<if test="thirdPartyMerchCode != null" >third_party_merch_code = #{thirdPartyMerchCode},</if>
+			<if test="thirdPartyMerchName != null" >third_party_merch_name = #{thirdPartyMerchName},</if>
 			<if test="moderSn != null" >moder_sn = #{moderSn},</if>
 			<if test="modTime != null" >mod_time = #{modTime},</if>
 			<if test="tstm != null" >tstm = #{tstm},</if>

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

@@ -48,6 +48,12 @@
             <Form-item label="门店编号" prop="storeNumber">
                 <i-input v-model="store.storeNumber" placeholder="门店编号"/>
             </Form-item>
+            <Form-item label="第三方商户编号" prop="thirdPartyMerchCode">
+                <i-input v-model="store.thirdPartyMerchCode" placeholder="第三方商户编号"/>
+            </Form-item>
+            <Form-item label="第三方商户名称" prop="thirdPartyMerchName">
+                <i-input v-model="store.thirdPartyMerchName" placeholder="第三方商户名称"/>
+            </Form-item>
             <Form-item label="门店地址" prop="storeAddress">
                 <i-input v-model="store.storeAddress" placeholder="门店地址"/>
             </Form-item>

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

@@ -44,9 +44,10 @@ TreeGrid.initColumn = function () {
             }
             return '-';
         }},
-        {title: '分类名称', field: 'name', align: 'center', valign: 'middle', width: '100px'},
+        {title: '分类名称', field: 'name', align: 'center', valign: 'middle', width: '60px'},
+        {title: '商户编号', field: 'merchSn', align: 'center', valign: 'middle', width: '100px'},
         {title: '描述', field: 'frontDesc', align: 'center', valign: 'middle', width: '150px'},
-        {title: '首页展示', field: 'showIndex', align: 'center', valign: 'middle', width: '50px'},
+        {title: '首页排序', field: 'sortOrder', align: 'center', valign: 'middle', width: '50px'},
         {
             title: '显示',
             field: 'isShow',

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

@@ -50,7 +50,7 @@ let vm = new Vue({
 	data: {
         showList: true,
         title: null,
-		merch: {merchSn:'',merchName:'',merchShortName:'',sortOrder:'',isShow:''},
+		merch: {merchSn:'',merchName:'',merchShortName:'',sortOrder:'',isShow:1},
 		ruleValidate: {
             merchSn: [
 				{required: true, message: '商户编号不能为空', trigger: 'blur'}
@@ -74,7 +74,7 @@ let vm = new Vue({
 		add: function () {
 			vm.showList = false;
 			vm.title = "新增";
-			vm.merch = {};
+			vm.merch = {isShow:1};
 		},
 		update: function (event) {
             let id = getSelectedRow();

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

@@ -6,6 +6,8 @@ $(function () {
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
             {label: '商户编号', name: 'merchSn', index: 'merch_sn', width: 80},
             {label: '商户名称', name: 'merchName', index: 'merch_name', width: 60},
+            {label: '第三方商户编号', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 60},
+            {label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 60},
             {label: '门店名称', name: 'storeName', index: 'store_name', width: 80},
             {label: '门店编号', name: 'storeNumber', index: 'store_number', width: 80},
             {label: '门店地址', name: 'storeAddress', index: 'store_address', width: 80},
@@ -54,7 +56,19 @@ let vm = new Vue({
             ],
             storeNumber: [
                 {required: true, message: '门店编号不能为空', trigger: 'blur'}
-            ]
+            ],
+            thirdPartyMerchCode: [
+                {required: true, message: '第三方商户编号不能为空', trigger: 'blur'}
+            ],
+            thirdPartyMerchName: [
+                {required: true, message: '第三方商户名称不能为空', trigger: 'blur'}
+            ],
+            latitude: [
+                {required: true, message: '纬度不能为空', trigger: 'blur'}
+            ],
+            longitude: [
+                {required: true, message: '经度不能为空', trigger: 'blur'}
+            ],
         },
         q: {
             storeName: '',

kmall-api/src/main/java/com/kmall/api/api/ApiAuthController.java

@@ -190,7 +190,7 @@ public class ApiAuthController extends ApiBaseAction {
         Date nowTime = new Date();
         UserVo userVo = userService.queryObject(userId);
         if (null != userVo) {
-            MerchUserVo merchUser = apiMerchUserService.queryObjectByStoreId(storeId);
+            MerchUserVo merchUser = apiMerchUserService.queryObjectByStoreId(storeId,userId);
             MerchUserVo merchUserVo = new MerchUserVo();
             merchUserVo.setStoreId(Integer.parseInt(String.valueOf(storeId)));
             merchUserVo.setMerchSn(merchSn);

kmall-api/src/main/java/com/kmall/api/dao/ApiMerchUserMapper.java

@@ -3,6 +3,7 @@ package com.kmall.api.dao;
 
 import com.kmall.api.entity.MerchUserVo;
 import com.kmall.common.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * Dao
@@ -12,5 +13,5 @@ import com.kmall.common.dao.BaseDao;
  * @date 2018-12-05 14:34:32
  */
 public interface ApiMerchUserMapper extends BaseDao<MerchUserVo> {
-    MerchUserVo queryObjectByStoreId(Long storeId);
+    MerchUserVo queryObjectByStoreId(@Param("storeId") Long storeId, @Param("userId")Long userId);
 }

kmall-api/src/main/java/com/kmall/api/entity/OrderVo.java

@@ -722,6 +722,12 @@ public class OrderVo implements Serializable {
                 case 402:
                     order_status_text = "已退货";
                     break;
+                case 500:
+                    order_status_text = "订单关闭";
+                    break;
+                case 501:
+                    order_status_text = "支付失败";
+                    break;
             }
         }
         return order_status_text;

kmall-api/src/main/java/com/kmall/api/entity/StoreVo.java

@@ -68,6 +68,25 @@ public class StoreVo implements Serializable {
 
     private String merchName;
 
+    private String thirdPartyMerchCode;
+    private String thirdPartyMerchName;
+
+    public String getThirdPartyMerchCode() {
+        return thirdPartyMerchCode;
+    }
+
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode) {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchName() {
+        return thirdPartyMerchName;
+    }
+
+    public void setThirdPartyMerchName(String thirdPartyMerchName) {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
     public String getMerchSn() {
         return merchSn;
     }

kmall-api/src/main/java/com/kmall/api/service/ApiMerchUserService.java

@@ -48,7 +48,7 @@ public class ApiMerchUserService {
         return apiMerchUserMapper.deleteBatch(ids);
     }
 
-    public MerchUserVo queryObjectByStoreId(Long storeId){
-        return apiMerchUserMapper.queryObjectByStoreId(storeId);
+    public MerchUserVo queryObjectByStoreId(Long storeId,Long userId){
+        return apiMerchUserMapper.queryObjectByStoreId(storeId,userId);
     }
 }

kmall-api/src/main/java/com/kmall/api/service/ApiOrderService.java

@@ -421,7 +421,6 @@ public class ApiOrderService {
         BigDecimal actualPrice = orderTotalPrice.subtract(couponPrice);
 //        BigDecimal actualPrice = orderTotalPrice.subtract(fullCutCouponDec).subtract(couponPrice);
 
-        //商户（拼音首字母）+业务类型+编号
 //        String merchSn = OmsMerchPropertiesBuilder.instance().getMerchSn();
 //        String merchShortName = OmsMerchPropertiesBuilder.instance().getMerchShortName();
         MerchVo merchVo = apiMerchMapper.queryObjectByMerchSn(merchSn);
@@ -429,7 +428,17 @@ public class ApiOrderService {
         if(merchVo != null){
             merchShortName = merchVo.getMerchShortName();
         }
-        String orderSn = merchShortName + bizType + CommonUtil.generateOrderNumber();
+        String oneMerchName = "";
+        if(!merchShortName.equalsIgnoreCase("ZW")){
+            oneMerchName = "ZW";
+        }
+        String thirdMerchSn = "";
+        StoreVo storeVo = apiStoreMapper.queryObject(storeId);
+        if(storeVo != null){
+            thirdMerchSn = storeVo.getThirdPartyMerchCode();
+        }
+        //一级商户 + 二级商户（拼音首字母）+ 三级商户 + 业务类型 + 编号
+        String orderSn = oneMerchName + merchShortName + thirdMerchSn + bizType + CommonUtil.generateOrderNumber();
         orderInfo.setOrder_sn(orderSn);
         orderInfo.setMerchSn(merchSn);
 

kmall-api/src/main/java/com/kmall/api/util/CommonUtil.java

@@ -91,7 +91,7 @@ public class CommonUtil {
     public static String generateOrderNumber() {
         Calendar cal = Calendar.getInstance();
         cal.setTime(new Date());
-        String timeStr = DateUtils.format(cal.getTime(), DateUtils.DATE_TIME_PATTERN_YYYY_MM_DD_HH_MM_SS);
+        String timeStr = DateUtils.format(cal.getTime(), DateUtils.DATE_TIME_PATTERN_YYYY_MM_DD);
         return timeStr + CharUtil.getRandomNum(4);
     }
 

kmall-api/src/main/resources/mybatis/mapper/ApiCategoryMapper.xml

@@ -37,7 +37,7 @@
             *
         </if>
         from mall_category
-        where 1 = 1 and is_show = 1
+        where 1 = 1 and (is_show = 1
         <if test="parent_id != null and parent_id != null">
             and parent_id = #{parent_id}
         </if>
@@ -53,6 +53,7 @@
                 #{item}
             </foreach>
         </if>
+        )
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}

kmall-api/src/main/resources/mybatis/mapper/ApiMerchUserMapper.xml

@@ -42,7 +42,7 @@
 		`mod_time`,
 		`tstm`
 		from mall_merch_user
-		where store_id = #{value}
+		where store_id = #{storeId} and user_id = #{userId}
 	</select>
 
 	<select id="queryList" resultType="com.kmall.api.entity.MerchUserVo">

kmall-api/src/main/resources/mybatis/mapper/ApiStoreMapper.xml

@@ -23,6 +23,9 @@
         <result column="moder_sn" property="moderSn" jdbcType="VARCHAR" />
         <result column="mod_time" property="modTime" jdbcType="TIMESTAMP" />
         <result column="tstm" property="tstm" jdbcType="TIMESTAMP" />
+
+        <result property="thirdPartyMerchCode" column="third_party_merch_code"/>
+        <result property="thirdPartyMerchName" column="third_party_merch_name"/>
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.api.entity.StoreVo">
@@ -37,7 +40,7 @@
 			`latitude`,
 			`longitude`,
 			`cover_radius`,
-			`remark`,merch_sn, merch_name, creater_sn, create_time,
+			`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
     moder_sn, mod_time, tstm
 		from mall_store
 		where id = #{id}
@@ -55,7 +58,7 @@
         `latitude`,
         `longitude`,
         `cover_radius`,
-        `remark`,merch_sn, merch_name, creater_sn, create_time,
+        `remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
         moder_sn, mod_time, tstm
         from mall_store
         WHERE 1=1
@@ -160,7 +163,7 @@
         create_time,
         moder_sn,
         mod_time,
-        tstm
+        tstm,third_party_merch_code,third_party_merch_name,
         from mall_store a
         WHERE 1=1
         <if test="province_name != null and province_name.trim() != ''">

kmall-common/kmall-common.iml

@@ -45,6 +45,15 @@
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:17.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jxls:jxls:2.4.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl:2.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.jxls:jxls-poi:1.0.16" level="project" />
+    <orderEntry type="library" name="Maven: org.jxls:jxls-jexcel:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.10" level="project" />
+    <orderEntry type="library" name="Maven: org.jxls:jxls-reader:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-digester3:with-deps:3.2" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />

kmall-common/src/main/java/com/kmall/common/constant/Dict.java

@@ -352,7 +352,7 @@ public class Dict {
         item_201("201", "订单已付款"),
         item_300("300", "订单已发货"),
         item_301("301", "用户确认收货"),
-        //        item_400("400", "维权申请中"),
+//        item_400("400", "维权申请中"),
         item_401("401", "没有发货，退款"),
         item_402("402", "已收货，退款退货"),
         item_500("500", "订单已关闭"),

wx-mall/pages/category/category.js

@@ -204,7 +204,8 @@ Page({
                     goodsVo: res.data.goodsVo,
                     specificationList: res.data.specificationList,
                     productList: res.data.productList,
-                    openAttr: !that.data.openAttr
+                    openAttr: !that.data.openAttr,
+                    checkedSpecText: res.data.specificationList[0].valueList[0].value
                 });
                 //
                 let _specificationList = res.data.specificationList;

wx-mall/pages/category/category.wxml

@@ -88,7 +88,7 @@
             <image class="img" src="{{goodsVo.list_pic_url}}"></image>
             <view class="info">
               <view class="c">
-                <view class="p">价格：￥{{checkedProduct[0].retail_price}}</view>
+                <view class="p">价格：￥{{goodsVo.retail_price}}</view>
                 <view class="a" wx:if="{{productList.length>0}}">已选择：{{checkedSpecText}}</view>
               </view>
             </view>

wx-mall/pages/index/index.js

@@ -144,7 +144,7 @@ Page({
           },
           success: function (wxRes) {
             if (wxRes.data.errno === 0) {
-              console.log("用户信息更新成功");
+              // console.log("用户信息更新成功");
             }
           },
           fail: function (err) {

wx-mall/pages/ucenter/order/order.wxml

@@ -22,8 +22,10 @@
             <image wx:if="{{item.orderBizType==11}}" src="../../../static/images/service-ptsp.png" class="search-icon-shop"></image>
             <text class="biz-type" wx:if="{{item.orderBizType==11}}">{{item.merchName}}{{item.storeName}} - 普通商品</text> 
             
-            <!-- <text class="add_time">{{item.add_time}}{{orderList[0].id}}</text> -->
-            <text class="add_time" wx:if="{{tabIndex!=5}}">{{item.pay_status==3?'退款中':item.order_status_text}}{{item.order_status == 201 && item.isRefundStatus?"(维权申请中)":""}}
+            <!-- <text class="add_time">{{item.add_time}}{{orderList[0].id}}</text> -->            
+            <text class="add_time" wx:if="{{tabIndex!=5}}">{{tabIndex!=5 && item.order_status != 401 && item.pay_status!=7 && item.pay_status!=8?item.order_status_text:""}}{{item.order_status == 201 && item.isRefundStatus?"(维权申请中)":""}}{{item.pay_status==7?"订单关闭":""}}{{item.pay_status==8?"支付失败":""}}
+            </text>
+            <text class="add_time" wx:if="{{tabIndex!=5 && item.order_status==401}}">{{item.pay_status==3 && item.order_status==401?'退款中':""}}{{item.pay_status==4 && item.order_status == 401?"已退款":""}}{{item.pay_status==5 && item.order_status == 401?"退款关闭":""}}{{item.pay_status==6 && item.order_status == 401?"退款异常":""}}
             </text>
           </view>
         </view>