fixed 小问题修复更新

fuint-application/src/main/java/com/fuint/common/service/impl/GiveServiceImpl.java

@@ -7,6 +7,7 @@ import com.fuint.common.dto.GiveDto;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.param.GiveParam;
 import com.fuint.common.service.*;
+import com.fuint.common.util.CommonUtil;
 import com.fuint.common.util.DateUtil;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
@@ -127,6 +128,8 @@ public class GiveServiceImpl extends ServiceImpl<MtGiveMapper, MtGive> implement
              BeanUtils.copyProperties(mtGive, giveDto);
              giveDto.setCreateTime(DateUtil.formatDate(mtGive.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
              giveDto.setUpdateTime(DateUtil.formatDate(mtGive.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"));
+             giveDto.setMobile(CommonUtil.hidePhone(giveDto.getMobile()));
+             giveDto.setUserMobile(CommonUtil.hidePhone(giveDto.getUserMobile()));
              dataList.add(giveDto);
         }
 

fuint-application/src/main/java/com/fuint/common/service/impl/StoreServiceImpl.java

@@ -394,6 +394,9 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
         List<StoreDistanceBean> distanceList = mtStoreMapper.queryByDistance(merchantId, keyword, latitude, longitude);
         Map<String, Object> param = new HashMap<>();
         param.put("status", StatusEnum.ENABLED.getKey());
+        if (merchantId != null && merchantId > 0) {
+            param.put("merchant_id", merchantId);
+        }
         List<MtStore> storeList = mtStoreMapper.selectByMap(param);
 
         if (distanceList != null) {

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGiveLogController.java

@@ -7,6 +7,7 @@ import com.fuint.common.dto.GiveItemDto;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.service.AccountService;
 import com.fuint.common.service.GiveService;
+import com.fuint.common.util.CommonUtil;
 import com.fuint.common.util.ExcelUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.common.util.XlsUtil;
@@ -147,8 +148,8 @@ public class BackendGiveLogController extends BaseController {
                 if (groupInfo != null && couponInfo != null) {
                     GiveItemDto dto = new GiveItemDto();
                     dto.setId(item.getId());
-                    dto.setMobile(giveInfo.getUserMobile());
-                    dto.setUserMobile(giveInfo.getMobile());
+                    dto.setMobile(CommonUtil.hidePhone(giveInfo.getUserMobile()));
+                    dto.setUserMobile(CommonUtil.hidePhone(giveInfo.getUserMobile()));
                     dto.setGroupId(userCouponInfo.getGroupId());
                     dto.setGroupName(groupInfo.getName());
                     dto.setCouponId(userCouponInfo.getCouponId());

fuint-application/src/main/java/com/fuint/module/merchantApi/controller/MerchantMemberController.java

@@ -176,6 +176,7 @@ public class MerchantMemberController extends BaseController {
         mtUser.setUserNo(memberInfoParam.getUserNo());
         MtUser memberInfo;
         if (memberInfoParam.getId() == null) {
+            mtUser.setDescription("商户登记添加");
             memberInfo = memberService.addMember(mtUser, null);
         } else {
             memberInfo = memberService.updateMember(mtUser, false);