fixed 商户卡券权限问题

fuint-application/src/main/java/com/fuint/common/param/CouponListParam.java

@@ -15,6 +15,9 @@ public class CouponListParam extends PageParam implements Serializable {
     @ApiModelProperty(value="卡券类型", name="type")
     private String type;
 
+    @ApiModelProperty(value="商户ID", name="merchantId")
+    private Integer merchantId;
+
     @ApiModelProperty(value="领取所需积分", name="needPoint")
     private Integer needPoint;
 

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

@@ -331,9 +331,11 @@ public class BackendMemberController extends BaseController {
         BeanUtils.copyProperties(mtUser, memberInfo);
 
         MtUserGroup mtUserGroup = memberGroupService.queryMemberGroupById(memberInfo.getGroupId());
-        UserGroupDto userGroupDto = new UserGroupDto();
-        BeanUtils.copyProperties(mtUserGroup, userGroupDto);
-        memberInfo.setGroupInfo(userGroupDto);
+        if (mtUserGroup != null) {
+            UserGroupDto userGroupDto = new UserGroupDto();
+            BeanUtils.copyProperties(mtUserGroup, userGroupDto);
+            memberInfo.setGroupInfo(userGroupDto);
+        }
 
         // 隐藏手机号中间四位
         String phone = memberInfo.getMobile();

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCouponController.java

@@ -7,6 +7,7 @@ import com.fuint.common.param.CouponInfoParam;
 import com.fuint.common.param.CouponListParam;
 import com.fuint.common.param.CouponReceiveParam;
 import com.fuint.common.service.CouponService;
+import com.fuint.common.service.MerchantService;
 import com.fuint.common.service.SettingService;
 import com.fuint.common.service.UserCouponService;
 import com.fuint.common.util.DateUtil;
@@ -62,26 +63,33 @@ public class ClientCouponController extends BaseController {
     @Autowired
     private SettingService settingService;
 
+    /**
+     * 商户服务接口
+     */
+    @Autowired
+    private MerchantService merchantService;
+
     /**
      * 获取卡券列表数据
      */
     @ApiOperation(value = "获取卡券列表数据")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject list(HttpServletRequest request, @RequestBody CouponListParam couponListParam) throws BusinessCheckException {
+    public ResponseObject list(HttpServletRequest request, @RequestBody CouponListParam params) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
         UserInfo mtUser = TokenUtil.getUserInfoByToken(token);
         if (null != mtUser) {
-            couponListParam.setUserId(mtUser.getId());
+            params.setUserId(mtUser.getId());
         }
 
         Map<String, Object> outParams = new HashMap();
-
-        ResponseObject couponData = couponService.findCouponList(couponListParam);
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+        params.setMerchantId(merchantId);
+        ResponseObject couponData = couponService.findCouponList(params);
         outParams.put("coupon", couponData.getData());
 
         ResponseObject responseObject = getSuccessResult(outParams);
-
         return getSuccessResult(responseObject.getData());
     }