Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

framework/src/main/java/cn/lili/common/enums/ResultCode.java

@@ -226,6 +226,7 @@ public enum ResultCode {
     WALLET_WITHDRAWAL_FROZEN_AMOUNT_INSUFFICIENT(34006, "冻结金额不足，无法处理提现申请请求！"),
     WALLET_ERROR_INSUFFICIENT(34003, "零钱提现失败！"),
     WALLET_REMARK_ERROR(34004, "请填写审核备注！"),
+    WALLET_EXIT_ERROR(34000, "钱包已存在，无法重复创建"),
     WALLET_APPLY_ERROR(34005, "提现申请异常！"),
 
     /**

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java

@@ -223,7 +223,12 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
 
     @Override
     public MemberWallet save(String memberId, String memberName) {
-        MemberWallet memberWallet = new MemberWallet();
+        //获取会员预存款信息
+        MemberWallet memberWallet = this.getOne(new QueryWrapper<MemberWallet>().eq("member_id", memberId));
+        if (memberWallet != null) {
+            return memberWallet;
+        }
+        memberWallet = new MemberWallet();
         memberWallet.setMemberId(memberId);
         memberWallet.setMemberName(memberName);
         memberWallet.setMemberWallet(0D);

framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettingDTO.java

@@ -31,6 +31,6 @@ public class StoreSettingDTO {
 
     @NotEmpty
     @ApiModelProperty(value = "经纬度")
-    private String center;
+    private String storeCenter;
 
 }

framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java

@@ -138,6 +138,7 @@ public class StoreGoodsLabelServiceImpl extends ServiceImpl<StoreGoodsLabelMappe
     private List<StoreGoodsLabel> list(String storeId) {
         LambdaQueryWrapper<StoreGoodsLabel> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(StoreGoodsLabel::getStoreId, storeId);
+        queryWrapper.orderByDesc(StoreGoodsLabel::getSortOrder);
         return this.baseMapper.selectList(queryWrapper);
     }