修改部分bug

cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AdminController.java

@@ -159,6 +159,7 @@ public class AdminController {
         }
         user.setToken(token);
         request.setAttribute("user", user);
+        log.info("return user: {}", user);
         return new Result(user);
     }
 

cereshop-admin/src/main/java/com/shop/cereshop/admin/service/after/impl/CereOrderAfterServiceImpl.java

@@ -396,6 +396,7 @@ public class CereOrderAfterServiceImpl implements CereOrderAfterService {
             //通过快递鸟查询物流轨迹
             list = getAfterDileveries(list, kuaiDiNiaoService.findTraces(code, param.getDeliverFormid()));
         }
+        //TODO pxh 查询物流轨迹--接顺丰
         return list;
     }
 

cereshop-app/src/main/java/com/shop/cereshop/app/controller/extend/XsPayController.java

@@ -1,6 +1,5 @@
 package com.shop.cereshop.app.controller.extend;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.shop.cereshop.app.pay.xs.domain.XsCallBackRequestVo;
@@ -20,9 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
-import java.util.Base64;
-
 /**
  * 新生支付模块
  */
@@ -51,6 +47,7 @@ public class XsPayController {
      */
     @PostMapping("pay/notify")
     public String payNotify(@RequestParam(name = "msg") String msg) throws Exception {
+        log.info("----notify:" + msg);
         try {
             XsCallBackRequestVo xsCallBackRequestVo = xsPayService.parseCallBackRequestVo(msg);
             String status = xsCallBackRequestVo.getContent().getString("status");
@@ -73,7 +70,7 @@ public class XsPayController {
                     }
 
                 }
-                //TODO 如果不是跨境支付应该不调用该接口------pxh
+                //TODO pxh 如果不是跨境支付应该不调用该接口
                 if(StringUtils.equals(XspayConfig.DEFUALT_TRADE_TYPE,  XsPayEnum.TRADE_TYPE_CROSS_BOARD_PAYMENT.getCode())){
 //                    String payRequestBodyJson = xsPayService.getPayRequestBodyJson(merOrderId, new BigDecimal(Integer.parseInt(content.getString("orderAmount")) * 1.0f / 100),
 //                            XsPayEnum.TRADE_TYPE_CROSS_BOARD_PAYMENT.getCode(), content.getString("payType"));
@@ -93,12 +90,33 @@ public class XsPayController {
         return "success";
     }
 
+    @PostMapping("pay/notifyStatusChange")
+    public String payNotify(@RequestParam(name = "merOrderId") String merOrderId, @RequestParam(name = "dealId") String dealId) throws Exception {
+        log.info("----notify: " + merOrderId + "---" + dealId);
+        String[] split = merOrderId.split("-");
+        if(!EmptyUtils.isEmpty(split)){
+            String orderFormId=split[0];
+            if(!EmptyUtils.isEmpty(orderFormId)){
+                //支付有礼
+                cereShopOrderService.payGift(orderFormId);
+                //处理支付成功后的其他逻辑
+                cereShopOrderService.handleWxLog(orderFormId, dealId, merOrderId);
+            }
+
+        }
+        if(StringUtils.equals(XspayConfig.DEFUALT_TRADE_TYPE,  XsPayEnum.TRADE_TYPE_CROSS_BOARD_PAYMENT.getCode())){
+            xsPayService.requestBaoGuan(merOrderId, dealId);
+        }
+        return "success";
+    }
+
     /**
      * 支付通知回调
      * @throws Exception
      */
     @PostMapping("pay/baoguannotify")
     public String payBaoGuanNotify(@RequestParam(name = "msg") String msg) throws Exception {
+        log.info("----baoguannotify:" + msg);
         try {
             XsCallBackRequestVo xsCallBackRequestVo = xsPayService.parseCallBackRequestVo(msg);
             log.info(new Gson().toJson(xsCallBackRequestVo));
@@ -122,6 +140,7 @@ public class XsPayController {
 
     @PostMapping("pay/paystockbaoguan")
     public String payStockBaoGuan(@RequestParam(name = "msg") String msg) throws Exception {
+        log.info("----paystockbaoguan:" + msg);
         try {
             String orderNo = msg.split(",")[0];
             String payTransactionNo = msg.split(",")[1];

cereshop-app/src/main/java/com/shop/cereshop/app/controller/order/OrderController.java

@@ -221,6 +221,17 @@ public class OrderController {
     }
 
     /**
+     * 选择物流公司查询
+     * @return
+     */
+    @GetMapping("getExpressSelectNew")
+    @ApiOperation(value = "选择物流公司查询")
+    public Result<List<CerePlatformDict>> getExpressSelectNew() throws CoBusinessException{
+        List<CerePlatformDict> list =cerePlatformDictService.getExpressSelectNew();
+        return new Result(list,CoReturnFormat.SUCCESS);
+    }
+
+    /**
      * APP立即支付
      * @param param
      * @return

cereshop-app/src/main/java/com/shop/cereshop/app/pay/xs/service/impl/XsPayServiceImpl.java

@@ -501,9 +501,12 @@ public class XsPayServiceImpl implements XsPayService {
         }
 
         if(orderList.stream().noneMatch(item -> item.getIsCross() != null && item.getIsCross() == 1)){
+            log.info("境内订单");
             return;
         }
 
+        log.info("所有订单：" + new Gson().toJson(orderList));
+
         //只报关跨境订单
         orderList = orderList.stream().filter(item -> item.getIsCross() != null && item.getIsCross() == 1).collect(Collectors.toList());
 

cereshop-app/src/main/java/com/shop/cereshop/app/service/dict/CerePlatformDictService.java

@@ -14,6 +14,8 @@ public interface CerePlatformDictService {
 
     List<CerePlatformDict> getExpressSelect() throws CoBusinessException;
 
+    List<CerePlatformDict> getExpressSelectNew() throws CoBusinessException;
+
     List<String> getReasonSelect() throws CoBusinessException;
 
     String findByCompany(String express, Long dictPid);

cereshop-app/src/main/java/com/shop/cereshop/app/service/dict/impl/CerePlatformDictServiceImpl.java

@@ -31,8 +31,24 @@ public class CerePlatformDictServiceImpl implements CerePlatformDictService {
         if(IntegerEnum.EXPRESS_100.getCode().equals(express)){
             //查询快递100所属快递公司
             list=cerePlatformDictDAO.findExpressSelect(LongEnum.EXPRESS_100.getCode());
+        }else{
+            list=cerePlatformDictDAO.findExpressSelect(LongEnum.EXPRESS_NIAO.getCode());
+        }
+        return list;
+    }
+
+    @Override
+    public List<CerePlatformDict> getExpressSelectNew() throws CoBusinessException {
+        List<CerePlatformDict> list=new ArrayList<>();
+        //查询当前物流查询策略
+        Integer express = cerePlatformDictDAO.findExpress();
+        if(IntegerEnum.EXPRESS_100.getCode().equals(express)){
+            //查询快递100所属快递公司
+            list=cerePlatformDictDAO.findExpressSelect(LongEnum.EXPRESS_100.getCode());
         }else if(IntegerEnum.EXPRESS_NIAO.getCode().equals(express)){
             list=cerePlatformDictDAO.findExpressSelect(LongEnum.EXPRESS_NIAO.getCode());
+        }else if(IntegerEnum.EXPRESS_THEE.getCode().equals(express)){
+            list=cerePlatformDictDAO.findExpressSelect(LongEnum.EXPRESS_NIAO.getCode());
         }
         return list;
     }

cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java

@@ -520,6 +520,10 @@ public class CereShopOrderServiceImpl implements CereShopOrderService {
             openId = user.getAliUserId();
         }
 
+        if(!orderFormId.contains("XCX")) {
+            orderFormId = orderFormId + "-" + RandomStringUtil.getRandomCode(3, 0) + "XCX";
+        }
+
         Map<String, String> map = payService.gotoPay(orderFormId, price, openId, ip, ParamEnum.PAY_XCX.getCode(), param.getHuabeiPeriod());
         System.out.println("支付返回结果集" + map.toString());
         ObjectMapper mapper = new ObjectMapper();
@@ -1529,6 +1533,9 @@ public class CereShopOrderServiceImpl implements CereShopOrderService {
         } else if (orderNo.contains("APP")) {
             //APP支付
             payLog.setOutRefundNo("APPTK" + TimeUtils.todayTime() + order.getOrderFormid() + order.getBuyerUserId());
+        }else {
+            //小程序支付
+            payLog.setOutRefundNo("XCXTK" + TimeUtils.todayTime() + order.getOrderFormid() + order.getBuyerUserId());
         }
         payLog.setTransactionId(transactionId);
         payLog.setPaymentMode(order.getPaymentMode());

cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml

@@ -447,7 +447,7 @@
       </foreach>
       )
     </if>
-    ORDER BY a.create_time DESC
+    ORDER BY a.update_time DESC, a.create_time DESC, a.product_id ASC
   </select>
 
   <select id="getProductUsers" parameterType="com.shop.cereshop.app.param.canvas.CanvasAppProductParam"

cereshop-business/src/main/java/com/shop/cereshop/business/controller/ExpressController.java

@@ -46,4 +46,15 @@ public class ExpressController {
         List<CerePlatformDict> list =cerePlatformDictService.getExpressSelect();
         return new Result(list);
     }
+
+    /**
+     * 选择物流公司查询
+     * @return
+     */
+    @PostMapping(value = "getExpressSelectNew")
+    @ApiOperation(value = "选择物流公司查询")
+    public Result<List<CerePlatformDict>> getExpressSelectNew() throws CoBusinessException{
+        List<CerePlatformDict> list =cerePlatformDictService.getExpressSelectNew();
+        return new Result(list);
+    }
 }

cereshop-business/src/main/java/com/shop/cereshop/business/controller/ShopController.java

@@ -237,4 +237,16 @@ public class ShopController {
         cereShopOtherOrganizationsService.updateOrganizations(otherOrganizations,user);
         return new Result(user.getUsername(),"修改店铺认证（其他组织）", GsonUtil.objectToGson(otherOrganizations));
     }
+
+
+    /**
+     * 新生支付信息认证
+     * @return
+     */
+    @PostMapping(value = "registerByXs")
+    @ApiOperation(value = "新生支付信息认证")
+    public Result<Shop> registerByXs() throws CoBusinessException{
+        Shop shop=cerePlatformShopService.registerByXs(ContextUtil.getShopId());
+        return new Result(shop);
+    }
 }

cereshop-business/src/main/java/com/shop/cereshop/business/controller/XsPayController.java

@@ -90,7 +90,7 @@ public class XsPayController {
             log.info(new Gson().toJson(xsCallBackRequestVo));
             String status = xsCallBackRequestVo.getContent().getString("status");
             //2成功  3失败
-            if(StringUtils.equals(status, "0")){
+            if(StringUtils.equals(status, "1")){
                 log.info("退款回调成功");
                 //截取订单编号
                 JSONObject content = xsCallBackRequestVo.getContent();

cereshop-business/src/main/java/com/shop/cereshop/business/page/shop/Shop.java

@@ -53,6 +53,12 @@ public class Shop {
     private String shopPhone;
 
     /**
+     * 新生支付方开通的商家Id
+     */
+    @ApiModelProperty(value = "新生支付方开通的商家Id")
+    private String xsPayId;
+
+    /**
      * 主体类型
      */
     @ApiModelProperty(value = "主体类型")

cereshop-business/src/main/java/com/shop/cereshop/business/pay/xs/service/impl/XsPayServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.parser.Feature;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.shop.cereshop.business.page.shop.Shop;
 import com.shop.cereshop.business.pay.xs.domain.XsCallBackRequestVo;
 import com.shop.cereshop.business.pay.xs.domain.XsRequestBo;
 import com.shop.cereshop.business.pay.xs.service.XsPayService;
@@ -14,10 +15,10 @@ import com.shop.cereshop.business.pay.xs.utils.HttpUtils;
 import com.shop.cereshop.business.service.order.CereShopOrderService;
 import com.shop.cereshop.commons.config.XspayConfig;
 import com.shop.cereshop.commons.constant.CoReturnFormat;
+import com.shop.cereshop.commons.constant.IntegerEnum;
 import com.shop.cereshop.commons.constant.WxPayEnum;
 import com.shop.cereshop.commons.constant.XsPayEnum;
 import com.shop.cereshop.commons.exception.CoBusinessException;
-import com.shop.cereshop.commons.utils.EmptyUtils;
 import com.shop.cereshop.commons.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.utils.URIBuilder;
@@ -176,7 +177,7 @@ public class XsPayServiceImpl implements XsPayService {
         //构建请求参数
         Map<String, String> headMap = CommonUtils.buildHeadMap(PAY_SER_CODE);
 
-        Map<String, Object> contentMap = buildPayContentMap(orderFormid, money, tradeType,  XsPayEnum.PAY_TYPE_QRCODE.getCode(), XspayConfig.BUSINESS_RETURN_URL,
+        Map<String, Object> contentMap = build05ContentMap(orderFormid, money, tradeType,  XsPayEnum.PAY_TYPE_QRCODE.getCode(), XspayConfig.BUSINESS_RETURN_URL,
                 XspayConfig.BUSINESS_NOTICE_URL);
         //head+content做md5并根据加签方式加密
         String msg = CommonUtils.getRequestMsg(headMap, contentMap);
@@ -224,7 +225,7 @@ public class XsPayServiceImpl implements XsPayService {
         //构建请求参数
         Map<String, String> headMap = CommonUtils.buildHeadMap(PAY_SER_CODE);
 
-        Map<String, Object> contentMap = buildPayContentMap(orderFormid, money, tradeType, payType, XspayConfig.APP_RETURN_URL,
+        Map<String, Object> contentMap = build05ContentMap(orderFormid, money, tradeType, payType, XspayConfig.APP_RETURN_URL,
                 XspayConfig.APP_NOTICE_URL);
 
         XsRequestBo xsRequestBo = new XsRequestBo();
@@ -255,8 +256,8 @@ public class XsPayServiceImpl implements XsPayService {
      * 构建content请求参数——商家端的支付保证金，属于国内支付，不需要一些强制信息
      * @return
      */
-    private static Map<String,Object> buildPayContentMap(String orderFormid, BigDecimal money,  String tradeType,
-                                                         String payType, String returnUrl, String noticeUrl){
+    private static Map<String,Object> build05ContentMap(String orderFormid, BigDecimal money, String tradeType,
+                                                        String payType, String returnUrl, String noticeUrl){
         // 设置请求正文 contentMap有序，顺序按照文档从上到下，为空字段可不传该字段
         Map<String, Object> contentMap = new LinkedHashMap<>();
         //商户订单号
@@ -331,6 +332,54 @@ public class XsPayServiceImpl implements XsPayService {
         return contentMap;
     }
 
+
+    /**
+     * 构建content请求参数
+     * @param operationType 0-初始化  1-新增  2-修改
+     * @return
+     */
+    private static Map<String,Object> build15ContentMap(Shop shop, String operationType){
+        Map<String, Object> contentMap = new LinkedHashMap<>();
+        contentMap.put("subUserId", shop.getShopId());
+        contentMap.put("name", shop.getShopName());
+        if(IntegerEnum.PERSONAL.getCode().equals(shop.getAuthenType())){
+            //个体
+            contentMap.put("type", "0");
+            contentMap.put("idNo", shop.getPersonal().getPersonalIdCard());
+        }else if(IntegerEnum.INDIVIDUAL.getCode().equals(shop.getAuthenType())){
+            //个体工商户
+            contentMap.put("type", "1");
+            contentMap.put("idNo", shop.getIndividualBusinesses().getSubjectCode());
+        }else if(IntegerEnum.ORGANIZATION.getCode().equals(shop.getAuthenType())){
+            //其他组织
+            contentMap.put("type", "1");
+            contentMap.put("idNo", shop.getOtherOrganizations().getOtherCode());
+        }else {
+            //企业
+            contentMap.put("type", "1");
+            contentMap.put("idNo", shop.getEnterprise().getEnterpriseCode());
+        }
+        contentMap.put("currencyCode", "CNY");
+        contentMap.put("operationType", operationType);
+        contentMap.put("region", "0");
+        contentMap.put("country", "CHN");
+
+        contentMap.put("province", "");
+        contentMap.put("city", "");
+
+        contentMap.put("bankName", "中国工商银行");
+        //银行行号，各个银行节点对外的行号，没有人会记得，所以这先不用传值
+        contentMap.put("bankNo", "");
+        contentMap.put("bankAcctNo", "6212262201023557228");
+        contentMap.put("bankAddr", "");
+        contentMap.put("bankPeoNo", "");
+
+        contentMap.put("resv1", "");
+        contentMap.put("resv2", "");
+
+        contentMap.put("noticeUrl", "http://lcoalhost:8080/gatewayTest/notify");
+        return contentMap;
+    }
     /**
      * 构建分账明细
      * @return

cereshop-business/src/main/java/com/shop/cereshop/business/service/dict/CerePlatformDictService.java

@@ -14,5 +14,7 @@ public interface CerePlatformDictService {
 
     List<CerePlatformDict> getExpressSelect() throws CoBusinessException;
 
+    List<CerePlatformDict> getExpressSelectNew() throws CoBusinessException;
+
     List<CerePlatformDict> getSelect(String dictName) throws CoBusinessException;
 }

cereshop-business/src/main/java/com/shop/cereshop/business/service/dict/impl/CerePlatformDictServiceImpl.java

@@ -31,8 +31,24 @@ public class CerePlatformDictServiceImpl implements CerePlatformDictService {
         if(IntegerEnum.EXPRESS_100.getCode().equals(express)){
             //查询快递100所属快递公司
             list=cerePlatformDictDAO.findExpressSelect(LongEnum.EXPRESS_100.getCode());
+        }else{
+            list=cerePlatformDictDAO.findExpressSelect(LongEnum.EXPRESS_NIAO.getCode());
+        }
+        return list;
+    }
+
+    @Override
+    public List<CerePlatformDict> getExpressSelectNew() throws CoBusinessException {
+        List<CerePlatformDict> list=new ArrayList<>();
+        //查询当前物流查询策略
+        Integer express = cerePlatformDictDAO.findExpress();
+        if(IntegerEnum.EXPRESS_100.getCode().equals(express)){
+            //查询快递100所属快递公司
+            list=cerePlatformDictDAO.findExpressSelect(LongEnum.EXPRESS_100.getCode());
         }else if(IntegerEnum.EXPRESS_NIAO.getCode().equals(express)){
             list=cerePlatformDictDAO.findExpressSelect(LongEnum.EXPRESS_NIAO.getCode());
+        }else if(IntegerEnum.EXPRESS_THEE.getCode().equals(express)){
+            list=cerePlatformDictDAO.findExpressSelect(LongEnum.EXPRESS_NIAO.getCode());
         }
         return list;
     }

cereshop-business/src/main/java/com/shop/cereshop/business/service/shop/CerePlatformShopService.java

@@ -27,6 +27,14 @@ public interface CerePlatformShopService {
 
     Shop getById(Long shopId) throws CoBusinessException;
 
+    /**
+     * 注册新生支付商家信息
+     * @param shopId
+     * @return
+     * @throws CoBusinessException
+     */
+    Shop registerByXs(Long shopId) throws CoBusinessException;
+
     void update(ShopUpdateLogoParam param, CerePlatformBusiness user) throws CoBusinessException;
 
     void updateState(CerePlatformShop cerePlatformShop) throws CoBusinessException;

cereshop-business/src/main/java/com/shop/cereshop/business/service/shop/impl/CerePlatformShopServiceImpl.java

@@ -16,6 +16,8 @@ import com.shop.cereshop.business.page.shop.Shop;
 import com.shop.cereshop.business.page.shop.ShopConversion;
 import com.shop.cereshop.business.param.index.IndexParam;
 import com.shop.cereshop.business.param.shop.ShopUpdateLogoParam;
+import com.shop.cereshop.business.pay.xs.service.XsPayService;
+import com.shop.cereshop.business.pay.xs.service.impl.XsPayServiceImpl;
 import com.shop.cereshop.business.service.log.CerePlatformLogService;
 import com.shop.cereshop.business.service.shop.*;
 import com.shop.cereshop.business.utils.EncodeUtil;
@@ -30,6 +32,7 @@ import com.shop.cereshop.commons.domain.shop.CerePlatformShop;
 import com.shop.cereshop.commons.domain.shop.CereShopReturn;
 import com.shop.cereshop.commons.exception.CoBusinessException;
 import com.shop.cereshop.commons.utils.EmptyUtils;
+import com.shop.cereshop.commons.utils.StringUtils;
 import com.shop.cereshop.commons.utils.TimeUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -73,6 +76,9 @@ public class CerePlatformShopServiceImpl implements CerePlatformShopService {
     private CerePlatformLogService cerePlatformLogService;
 
     @Autowired
+    private XsPayService xsPayService;
+
+    @Autowired
     private CereShopVisitDAO cereShopVisitDAO;
 
     @Autowired
@@ -124,6 +130,36 @@ public class CerePlatformShopServiceImpl implements CerePlatformShopService {
     }
 
     @Override
+    public Shop registerByXs(Long shopId) throws CoBusinessException {
+        Shop shop=cerePlatformShopDAO.findShop(shopId);
+        if(shop!=null){
+            //查询店铺退货地址信息
+            CereShopReturn cereShopReturn=cereShopReturnService.findByShopId(shopId);
+            shop.setShopReturn(cereShopReturn);
+            //查询认证数据
+            if(IntegerEnum.getByName("主体类型-个人").equals(shop.getAuthenType())){
+                //个人认证
+                shop.setPersonal(cereShopPersonalService.findByShopId(shopId));
+            }else if(IntegerEnum.getByName("主体类型-个体工商户").equals(shop.getAuthenType())){
+                //个体工商户户认证
+                shop.setIndividualBusinesses(cereShopIndividualBusinessesService.findByShopId(shopId));
+            }else if(IntegerEnum.getByName("主体类型-企业").equals(shop.getAuthenType())){
+                //企业认证
+                shop.setEnterprise(cereShopEnterpriseService.findByShopId(shopId));
+            }else if(IntegerEnum.getByName("主体类型-其他组织").equals(shop.getAuthenType())){
+                //其他组织认证
+                shop.setOtherOrganizations(cereShopOtherOrganizationsService.findByShopId(shopId));
+            }
+        }
+
+        if(StringUtils.isEmpty(shop.getXsPayId())){
+            //如果不为空则是之前已经注册了，为空表示需要注册
+//            xsPayService
+        }
+        return shop;
+    }
+
+    @Override
     @Transactional(isolation= Isolation.DEFAULT,propagation= Propagation.REQUIRED,rollbackFor = {CoBusinessException.class, Exception.class})
     public void update(ShopUpdateLogoParam param, CerePlatformBusiness user) throws CoBusinessException {
         String time= TimeUtils.yyMMddHHmmss();

cereshop-business/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml

@@ -296,7 +296,7 @@
   </select>
 
   <select id="findShop" parameterType="java.lang.Object" resultType="com.shop.cereshop.business.page.shop.Shop">
-    SELECT shop_id,shop_logo,shop_name,shop_adress,shop_brief,shop_phone,authen_type,authentication_state
+    SELECT shop_id,shop_logo,shop_name,shop_adress,shop_brief,shop_phone,authen_type,authentication_state, xs_pay_id
     FROM cere_platform_shop where shop_id = #{shopId}
   </select>
 

cereshop-commons/src/main/java/com/shop/cereshop/commons/constant/IntegerEnum.java

@@ -148,6 +148,7 @@ public enum IntegerEnum {
     AFTER_ADMIN_ERROR("平台介入售后状态-拒绝",2),
     EXPRESS_100("物流查询策略-快递100",1),
     EXPRESS_NIAO("物流查询策略-快递鸟",2),
+    EXPRESS_THEE("物流查询策略-得壹",3),
     MESSAGE_SUCCESS("短信发送状态-成功",1),
     MESSAGE_ERROR("短信发送状态-失败",2),
     DIRECT_TYPE("佣金类型-直接",1),

cereshop-commons/src/main/java/com/shop/cereshop/commons/constant/LongEnum.java

@@ -19,7 +19,8 @@ public enum LongEnum {
     ZERO("0",0l),
     PLATFORM("平台端权限或角色",1l),
     EXPRESS_100("快递100",7l),
-    EXPRESS_NIAO("快递鸟",8l);
+    EXPRESS_NIAO("快递鸟",8l),
+    EXPRESS_THEE("得壹",2395l);
 
     String name;
     Long code;

cereshop-commons/src/main/java/com/shop/cereshop/commons/constant/StringEnum.java

@@ -70,10 +70,10 @@ public enum StringEnum {
     YES("是","是"),
     NO("否","否"),
     UP("上架","上架"),
-    NOTICE_TITLE_ORDER_CANCEL("消息标题为订单已关闭","消息标题为订单已关闭"),
-    NOTICE_TITLE_ORDER_PAY_SUCCESS("消息标题为支付成功","消息标题为支付成功"),
-    NOTICE_TITLE_ORDER_DELIVERY("消息标题为商家已放货","消息标题为商家已放货"),
-    NOTICE_TITLE_ORDER_FINISH("消息标题为订单已完成","消息标题为订单已完成"),
+    NOTICE_TITLE_ORDER_CANCEL("订单已关闭","订单已关闭"),
+    NOTICE_TITLE_ORDER_PAY_SUCCESS("支付成功","支付成功"),
+    NOTICE_TITLE_ORDER_DELIVERY("商家已放货","商家已放货"),
+    NOTICE_TITLE_ORDER_FINISH("订单已完成","订单已完成"),
     WX_RETURN_CODE("微信支付返回状态码","return_code"),
     WX_PAY_SUCCESS("微信支付成功标识","SUCCESS"),
     ALI_PAY_TRADE_STATUS("支付宝返回状态码","trade_status"),

doc/2.0/update.sql

@@ -78,3 +78,6 @@ ALTER TABLE `cere_shop_product` ADD COLUMN `brand_id` bigint(20) NULL DEFAULT NU
 
 -- 20230510更新
 alter table `cere_shop_cart` add UNIQUE KEY `uqe_buyer_user_id_sku_id` (`buyer_user_id`,`sku_id`);
+
+
+ALTER TABLE cere_platform_shop ADD xs_pay_id varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '新生支付商户Id';