Merge remote-tracking branch 'origin/lyf' into lyf

src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java

@@ -46,7 +46,6 @@ public class LoginFilter implements Filter {
             "cashierService/common/**",//通用接口
             "cashierService/distirict/**",//首页其它接口
             "cashierService/login/**",//登录部分接口不校验
-            "cashierService/product/queryShopIdByTableCode",
             "cashierService/product/queryProduct",
             "cashierService/product/productInfo",
             "cashierService/notify/**",//登录部分接口不校验

src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java

@@ -56,16 +56,12 @@ public class PayController {
     /**
      * 储值卡支付
      * @param token
-     * @param loginName
-     * @param clientType
      * @param orderId
      * @param memberId
      * @return
      */
     @GetMapping("accountPay")
     public Result accountPay(@RequestHeader("token") String token,
-                             @RequestHeader("loginName") String loginName,
-                             @RequestHeader("clientType") String clientType,
                              @RequestParam("orderId") String orderId,
                              @RequestParam("memberId") String memberId
     ){
@@ -86,6 +82,7 @@ public class PayController {
         }else {
             userId = TokenUtil.parseParamFromToken(token).getString("userId");
         }
+        //订单支付 orderId:62,payType=wechatPay,userId:or1l860rwM-rU_j9KrgMOwued
         log.info("订单支付 orderId:{},payType={},userId:{}",orderId,payType,userId);
         try {
 //            if(StringUtils.isNotBlank(orderType) && orderType.equals("group")){

src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java

@@ -376,11 +376,11 @@ public class PayService {
             throw new MsgException("生成订单错误");
         }
 
-        if (ObjectUtil.isNull(tbMerchantAccount.getMerchantId()) || ObjectUtil.isEmpty(tbMerchantAccount.getMerchantId())) {
+        if (ObjectUtil.isNull(tbMerchantAccount)) {
             return Result.fail("没有对应的商户");
         }
 
-        TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(Integer.valueOf(tbMerchantAccount.getMerchantId()));
+        TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(Integer.valueOf(tbMerchantAccount.getId()));
 
         if (ObjectUtil.isEmpty(thirdApply) || ObjectUtil.isNull(thirdApply)) {
             return Result.fail("支付通道不存在");