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

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java

@@ -43,6 +43,7 @@ public class ShopUserDetailDTO extends ShopUser {
      * 支付密码
      */
     private String payPwd;
+    private Integer usePayPwd;
     /**
      * 店铺拓展参数
      */

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java

@@ -35,6 +35,7 @@ public class ShopUserFlow implements Serializable {
     private Long id;
 
     private Long userId;
+    private Long shopUserId;
 
     private Long shopId;
     /**

cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java

@@ -1,5 +1,6 @@
 package com.czg.market.service;
 
+import com.czg.account.entity.ShopUser;
 import com.czg.constant.TableValueConstant;
 import com.czg.exception.ApiNotPrintException;
 import com.czg.market.dto.MemberConfigDTO;
@@ -46,7 +47,7 @@ public interface TbMemberConfigService extends IService<TbMemberConfig> {
      * @param expVal 经验值，只有当type为pay的时候才生效
      * @return 是否成功
      */
-    boolean deliver(Long shopId, Long userId, TableValueConstant.MemberExpFlow.Type type, BigDecimal money, Integer expVal, Long sourceId);
+    boolean deliver(ShopUser shopUser, TableValueConstant.MemberExpFlow.Type type, BigDecimal money, Integer expVal, Long sourceId);
 
     /**
      * 获取用户会员列表