fix：“优化分销申请接口，做糖列表接口”

src/main/java/com/szwl/controller/SugarDoOrderController.java

@@ -32,14 +32,6 @@ public class SugarDoOrderController {
     @Autowired
     TEquipmentService equipmentService;
 
-//    @Autowired
-//    private TAdminService adminService;
-//
-//    @Autowired
-//    private TProductService productService;
-
-
-
     //远程做糖状态回返
     @RequestMapping(value = "/updateSugarDoStatus.htm", method = RequestMethod.GET, produces = "text/html;charset=utf-8")
     @ResponseBody
@@ -57,15 +49,11 @@ public class SugarDoOrderController {
                 }
                 sugarDoService.updateById(sugarDo);
             }else {
-//                return JsonMessage.error("error");
                 return "error";
             }
         }else {
-//            return JsonMessage.error("error");
             return "error";
         }
-
-//        return JsonMessage.success("success");
         return "success";
     }
 

src/main/java/com/szwl/controller/TProportionController.java

@@ -283,7 +283,6 @@ public class TProportionController {
         if(equipment == null){
             return R.fail("找不到该机器！");
         }
-//        TEquipment equipment = equipmentList.get(0);
         //查看是否有审核中的
         LambdaQueryWrapper<TProportionCheck> queryCheck = Wrappers.lambdaQuery();
         queryCheck.eq(TProportionCheck::getAdminId,tProportion.getAdminId());
@@ -301,10 +300,8 @@ public class TProportionController {
             //1个
             LambdaQueryWrapper<TAdmin> queryTAdmin = Wrappers.lambdaQuery();
             queryTAdmin.eq(TAdmin::getUsername,tProportion.getAgencyName());
-//            List<TAdmin> admins = adminService.list(queryTAdmin);
             TAdmin admins = adminService.getOne(queryTAdmin);
             if(admins != null){
-//                TAdmin tAdmin = admins.get(0);
                 agencyId = admins.getId();
             }else {
                 return R.fail("找不到第一个分账人！");
@@ -314,10 +311,8 @@ public class TProportionController {
             //2个
             LambdaQueryWrapper<TAdmin> queryTAdmin1 = Wrappers.lambdaQuery();
             queryTAdmin1.eq(TAdmin::getUsername,tProportion.getMerchantName());
-//            List<TAdmin> admins1 = adminService.list(queryTAdmin1);
             TAdmin admins1 = adminService.getOne(queryTAdmin1);
             if(admins1 != null){
-//                TAdmin tAdmin = admins1.get(0);
                 merchantId = admins1.getId();
             }else {
                 return R.fail("找不到第二个分账人！");
@@ -327,10 +322,8 @@ public class TProportionController {
             //3个
             LambdaQueryWrapper<TAdmin> queryTAdmin2 = Wrappers.lambdaQuery();
             queryTAdmin2.eq(TAdmin::getUsername,tProportion.getPersonageName());
-//            List<TAdmin> admins2 = adminService.list(queryTAdmin2);
             TAdmin admins2 = adminService.getOne(queryTAdmin2);
             if(admins2 != null){
-//                TAdmin tAdmin = admins2.get(0);
                 personageId = admins2.getId();
             }else {
                 return R.fail("找不到第三个分账人！");
@@ -340,23 +333,8 @@ public class TProportionController {
         LambdaQueryWrapper<TProportion> query = Wrappers.lambdaQuery();
         query.eq(TProportion::getAdminId,tProportion.getAdminId());
         query.eq(TProportion::getClientId,tProportion.getClientId());
-//        List<TProportion> list = tProportionService.list(query);
         TProportion proportion = tProportionService.getOne(query);
         if(proportion != null){
-            //已有，属于第二次提交信息，需要审核
-//            TProportion oldProportion = list.get(0);
-            //已有，判断是否为99%和1%组合
-//            if(tProportion.getProportion().compareTo(new BigDecimal("99"))==0&&tProportion.getAdminProportion().compareTo(new BigDecimal("1"))==0){
-//                oldProportion.setAgencyId(agencyId);
-//                oldProportion.setMerchantId(merchantId);
-//                oldProportion.setPersonageId(personageId);
-//                oldProportion.setAgencyProportion(BigDecimal.valueOf(0.00));
-//                oldProportion.setMerchantProportion(BigDecimal.valueOf(0.00));
-//                oldProportion.setPersonageProportion(BigDecimal.valueOf(0.00));
-//                oldProportion.setModifyDate(new Date());
-//                tProportionService.updateById(tProportion);
-//                return R.ok("修改成功");
-//            }else {
                 //提交审核
                 TProportionCheck proportionCheck = new TProportionCheck();
                 proportionCheck.setAdminId(tProportion.getAdminId());
@@ -382,6 +360,26 @@ public class TProportionController {
                 return R.ok("已提交审核");
 //            }
         }else {
+            //提交审核
+            TProportionCheck proportionCheck = new TProportionCheck();
+            proportionCheck.setAdminId(tProportion.getAdminId());
+            proportionCheck.setEquipmentId(equipment.getId());
+            proportionCheck.setEquipmentName(equipment.getName());
+            proportionCheck.setClientId(tProportion.getClientId());
+            proportionCheck.setType(tProportion.getType());
+            proportionCheck.setProportion(tProportion.getProportion());
+            proportionCheck.setAdminProportion(tProportion.getAdminProportion());
+            proportionCheck.setAgencyId(agencyId);
+            proportionCheck.setMerchantId(merchantId);
+            proportionCheck.setPersonageId(personageId);
+            proportionCheck.setAgencyProportion(tProportion.getAgencyProportion());
+            proportionCheck.setMerchantProportion(tProportion.getMerchantProportion());
+            proportionCheck.setPersonageProportion(tProportion.getPersonageProportion());
+            proportionCheck.setAgencyName(tProportion.getAgencyName());
+            proportionCheck.setMerchantName(tProportion.getMerchantName());
+            proportionCheck.setPersonageName(tProportion.getPersonageName());
+            proportionCheck.setCreateDate(new Date());
+            proportionCheck.setModifyDate(new Date());
             //没有，判断是否为99%和1%组合
             if(tProportion.getProportion().compareTo(new BigDecimal("99"))==0&&tProportion.getAdminProportion().compareTo(new BigDecimal("1"))==0){
                 tProportion.setAgencyId(agencyId);
@@ -395,36 +393,14 @@ public class TProportionController {
                 tProportion.setCreateDate(new Date());
                 tProportion.setModifyDate(new Date());
                 tProportionService.save(tProportion);
+                proportionCheck.setCheckType("1");
+                tProportionCheckService.save(proportionCheck);
                 return R.ok("添加成功");
             }else {
-                //提交审核
-                TProportionCheck proportionCheck = new TProportionCheck();
-                proportionCheck.setAdminId(tProportion.getAdminId());
-                proportionCheck.setEquipmentId(equipment.getId());
-                proportionCheck.setEquipmentName(equipment.getName());
-                proportionCheck.setClientId(tProportion.getClientId());
-                proportionCheck.setType(tProportion.getType());
-                proportionCheck.setProportion(tProportion.getProportion());
-                proportionCheck.setAdminProportion(tProportion.getAdminProportion());
-                proportionCheck.setAgencyId(agencyId);
-                proportionCheck.setMerchantId(merchantId);
-                proportionCheck.setPersonageId(personageId);
-                proportionCheck.setAgencyProportion(tProportion.getAgencyProportion());
-                proportionCheck.setMerchantProportion(tProportion.getMerchantProportion());
-                proportionCheck.setPersonageProportion(tProportion.getPersonageProportion());
-                proportionCheck.setAgencyName(tProportion.getAgencyName());
-                proportionCheck.setMerchantName(tProportion.getMerchantName());
-                proportionCheck.setPersonageName(tProportion.getPersonageName());
-                proportionCheck.setCreateDate(new Date());
-                proportionCheck.setModifyDate(new Date());
                 proportionCheck.setCheckType("0");
                 tProportionCheckService.save(proportionCheck);
                 return R.ok("已提交审核");
             }
-//            tProportion.setSettleableBalance(BigDecimal.valueOf(0.00));
-//            tProportion.setCreateDate(new Date());
-//            tProportion.setModifyDate(new Date());
-//            tProportionService.save(tProportion);
         }
     }
     @ApiOperation(value = "")

src/main/java/com/szwl/controller/TSugarDoController.java

@@ -166,12 +166,12 @@ public class TSugarDoController {
             String[] split = format.split(" ");
             String s = split[1];
             if(sugarDo.getStatus().equals("1")){
-                sugarDo.setProductName("商品:"+sugarDo.getProductName()+" 时间:"+s+" 已做糖 "+" 设备:"+sugarDo.getClientId().substring(sugarDo.getClientId().length()-6,sugarDo.getClientId().length()));
+//                sugarDo.setProductName("商品:"+sugarDo.getProductName()+" 时间:"+s+" 已做糖 "+" 设备:"+sugarDo.getClientId().substring(sugarDo.getClientId().length()-6));
                 sugarDos.add(sugarDo);
 
             }
             if(sugarDo.getStatus().equals("2")){
-                sugarDo.setProductName("商品:"+sugarDo.getProductName()+" 时间:"+s+ " 异常:"+sugarDo.getNote()+" 设备:"+sugarDo.getClientId().substring(sugarDo.getClientId().length()-6,sugarDo.getClientId().length()));
+//                sugarDo.setProductName("商品:"+sugarDo.getProductName()+" 时间:"+s+ " 异常:"+sugarDo.getNote()+" 设备:"+sugarDo.getClientId().substring(sugarDo.getClientId().length()-6));
                 sugarDos.add(sugarDo);
 
             }