yshop2.1.3修复优化版本

yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java

@@ -40,7 +40,7 @@ public interface YxStoreBargainService extends BaseService<YxStoreBargain> {
 
     TopCountDTO topCount(int bargainId);
 
-    BargainCountDTO helpCount(int bargainId, int uid);
+    BargainCountDTO helpCount(int bargainId, int uid,int myUid);
 
     int getBargainPayCount(int bargainId);
 

yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java

@@ -189,9 +189,11 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl<YxStoreBargainMap
      * @param uid
      */
     @Override
-    public BargainCountDTO helpCount(int bargainId, int uid) {
+    public BargainCountDTO helpCount(int bargainId, int uid,int myUid) {
         YxStoreBargainUser storeBargainUser = storeBargainUserService
                 .getBargainUserInfo(bargainId,uid);
+
+        boolean userBargainStatus = true;
         if(ObjectUtil.isNull(storeBargainUser)) {
             BargainCountDTO bargainCountDTO = BargainCountDTO
                     .builder()
@@ -200,11 +202,18 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl<YxStoreBargainMap
                     .status(0)
                     .pricePercent(0)
                     .price(0d)
+                    .userBargainStatus(userBargainStatus)
                     .build();
 
             return bargainCountDTO;
         }
 
+        int helpCount = storeBargainUserHelpService.count(new QueryWrapper<YxStoreBargainUserHelp>()
+                .eq("bargain_user_id", storeBargainUser.getId())
+                .eq("bargain_id",bargainId).eq("uid",myUid));
+
+        if(helpCount > 0) userBargainStatus = false;
+
 
         int count = storeBargainUserHelpService
                 .getBargainUserHelpPeopleCount(bargainId,storeBargainUser.getId());
@@ -229,6 +238,7 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl<YxStoreBargainMap
                 .status(storeBargainUser.getStatus())
                 .pricePercent(pricePercent)
                 .price(NumberUtil.sub(diffPrice,storeBargainUser.getPrice()).doubleValue())
+                .userBargainStatus(userBargainStatus)
                 .build();
 
         return bargainCountDTO;

yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserHelpServiceImpl.java

@@ -61,6 +61,7 @@ public class YxStoreBargainUserHelpServiceImpl extends BaseServiceImpl<YxStoreBa
     @Autowired
     private StoreBargainHelpMap storeBargainHelpMap;
 
+
     /**
      * 获取砍价帮
      * @param bargainId

yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java

@@ -120,8 +120,8 @@ public class StoreBargainController extends BaseController {
         Integer bargainId = jsonObject.getInteger("bargainId");
         Integer bargainUserUid = jsonObject.getInteger("bargainUserUid");
         if(ObjectUtil.isNull(bargainId) || ObjectUtil.isNull(bargainUserUid)) return ApiResult.fail("参数错误");
-
+        int uid = SecurityUtils.getUserId().intValue();
-        return ApiResult.ok(storeBargainService.helpCount(bargainId,bargainUserUid));
+        return ApiResult.ok(storeBargainService.helpCount(bargainId,bargainUserUid,uid));
     }
 
     /**

yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/BargainCountDTO.java

@@ -18,6 +18,7 @@ public class BargainCountDTO implements Serializable {
     private Integer pricePercent;
     private Integer status;
     private Double price; //剩余的砍价金额
+    private Boolean userBargainStatus; // 是否帮别人砍,没砍是true，砍了false
 
 
 }

yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java

@@ -79,9 +79,9 @@ public class UserBillController extends BaseController {
 
         //判断分销类型
         String statu = systemConfigService.getData("store_brokerage_statu");
+        YxUserQueryVo userQueryVo = yxUserService.getYxUserById(uid);
         if(StrUtil.isNotEmpty(statu)){
             if(Integer.valueOf(statu) == 1){
-                YxUserQueryVo userQueryVo = yxUserService.getYxUserById(uid);
                 if(userQueryVo.getIsPromoter() == 0){
                     return ApiResult.fail("你不是推广员哦!");
                 }
@@ -92,18 +92,13 @@ public class UserBillController extends BaseController {
         double lastDayCount = userBillService.yesterdayCommissionSum(uid);
         //累计提现金额
         double extractCount = extractService.extractSum(uid);
-        //获取总佣金
-        double commissionCount = userBillService.getBrokerage(uid);
 
-        //计算当前拥有的佣金
-        if(commissionCount > 0){
 
-        }
 
         Map<String,Object> map = new LinkedHashMap<>();
         map.put("lastDayCount",lastDayCount);
         map.put("extractCount",extractCount);
-        map.put("commissionCount",commissionCount);
+        map.put("commissionCount",userQueryVo.getBrokeragePrice());
 
         return ApiResult.ok(map);
     }

yshop-generator/src/main/java/co/yixiang/rest/GeneratorController.java

@@ -47,7 +47,7 @@ public class GeneratorController {
     public ResponseEntity<Object> getTables(@RequestParam(defaultValue = "") String name,
                                     @RequestParam(defaultValue = "0")Integer page,
                                     @RequestParam(defaultValue = "10")Integer size){
-        int[] startEnd = PageUtil.transToStartEnd(page+1, size);
+        int[] startEnd = PageUtil.transToStartEnd(page, size);
         return new ResponseEntity<>(generatorService.getTables(name,startEnd), HttpStatus.OK);
     }