Merge branch 'master' of http://111.47.29.214:3000/udream-cxs/lift-server.git

lift-ud-service/src/main/java/cn/com/ty/lift/ud/coupon/controller/CouponController.java

@@ -84,9 +84,9 @@ public class CouponController extends BaseController<Coupon, CouponQuery> {
         String userMobile = CurrentUserInfo.userMobile();
         UserInfoEntity userByMobile = iUserInfoService.getUserByMobile(userMobile);
         if (userByMobile != null) {
-            List<Role> byUserIdList = roleService.getByUserId(userByMobile.getUserId());
-            for (Role byUserId : byUserIdList) {
-                if (byUserId.getCode().equals("REGION_DIRECTOR")) {// 区域主管审核
+            List<Role> currentUserRoleList = roleService.getByUserId(userByMobile.getUserId());
+            for (Role role : currentUserRoleList) {
+                if (role.getCode().equals("REGION_DIRECTOR")) {// 区域主管审核
                     if (neDto.getCheckFalg() == 1) {
                     	couponService.updateSatus(neDto.getId(), 3, 0);
                         return RestResponse.success("审批成功，等待财务审核");
@@ -95,7 +95,7 @@ public class CouponController extends BaseController<Coupon, CouponQuery> {
                         return RestResponse.success("驳回成功");
                     }
                 }
-                if (byUserId.getCode().equals("FINANCE")) {// 财务审核
+                if (role.getCode().equals("FINANCE")) {// 财务审核
                     if (neDto.getCheckFalg() == 1) {
                         couponService.updateSatus(neDto.getId(), 1, 1);
                         return RestResponse.success("审批通过");

lift-ud-service/src/main/java/cn/com/ty/lift/ud/coupon/mapper/entity/Coupon.java

@@ -86,4 +86,18 @@ public class Coupon extends BaseEntity {
      */
     @ApiModelProperty("备注")
     private String remark;
+
+
+    /**
+     * 红包总个数
+     */
+    @ApiModelProperty("红包总个数")
+    private Integer num;
+
+
+    /**
+     * 红包总额
+     */
+    @ApiModelProperty("红包总额")
+    private BigDecimal totalPrice;
 }