更新

src/main/java/com/szwl/aspect/MyWebMvcConfigurer.java

@@ -21,7 +21,7 @@ public class MyWebMvcConfigurer extends WebMvcConfigurationSupport {
         // 自定义去除的路径
         String[] myExcludes= {"/tAdmin/login","/tAdmin/save","/tAdmin/updatePassword","/tMessageCode/**","/tJoinpayMch/**","/tLogo/**",
                 "/tProportion/**","/tProduct/**","/tPromoCode/**", "/tProportionCheck/**", "/tProduct/selectProductList",  "/rabbitMqController/**","/tJoinpayMchCheck/**","/indexController/**","/sysRoleMenu/**",
-                "/tEquipmentApply/**","/api/**","/error"};
+                "/tEquipmentApply/**","/tEquipment/**","/api/**","/tAdmin/**","/tNotice/**","/tArea/**","/error"};
         registry.addInterceptor(headTokenInterceptor).addPathPatterns("/**")
                 // swagger
                 .excludePathPatterns(swaggerExcludes)

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

@@ -45,6 +45,7 @@ public class ApkInfoController {
         }
         LambdaQueryWrapper<TApkInfo> query = Wrappers.lambdaQuery();
         query.eq(TApkInfo::getModel,model);
+        query.orderByDesc(TApkInfo::getVersion);
         List<TApkInfo> list = tApkInfoService.list(query);
         TApkInfo info = list.get(0);
             if (info != null) {

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

@@ -155,9 +155,7 @@ public class IndexController { ;
      * @return
      */
     @ApiOperation(value = "设备申请")
-//    @PostMapping("/initNew.htm")
     @RequestMapping(value = "/initNew.htm", method = RequestMethod.POST, produces = "text/html;charset=utf-8")
-//    @RequestMapping(value = "/initNew.htm", method = RequestMethod.POST)
     @ResponseBody
     public String initNew(String clientId, String managerId, String gtClientId, String equimentType) {
         String machineType = "0";
@@ -208,15 +206,18 @@ public class IndexController { ;
 //            return JsonMessage.success("设备申请成功");
             return "设备申请成功";
         }
-        Date applyStartTime = admin.getApplyStartTime();
-        Date applyEndTime = admin.getApplyEndTime();
-        Date now = new Date();
-        if(now.getTime()>applyStartTime.getTime()&&now.getTime()<applyEndTime.getTime()){
-            Long id = equipmentApply.getId();
-            agree(id);
+        if(admin.getApplyStartTime()!=null&&admin.getApplyEndTime()!=null){
+            Date applyStartTime = admin.getApplyStartTime();
+            Date applyEndTime = admin.getApplyEndTime();
+            Date now = new Date();
+            if(now.getTime()>applyStartTime.getTime()&&now.getTime()<applyEndTime.getTime()){
+                Long id = equipmentApply.getId();
+                agree(id);
 //            return JsonMessage.success("设备申请成功");
-            return "设备申请成功";
+                return "设备申请成功";
+            }
         }
+
 //        return JsonMessage.success("设备申请中，请耐心等待");
         return "设备申请中，请耐心等待";
 
@@ -1343,6 +1344,43 @@ public class IndexController { ;
 
         return jsonObject.toJSONString();
     }
+    /**
+     * 根据设备编号获取商品信息
+     */
+    @RequestMapping(value = "/getproducts", method = RequestMethod.GET, produces = "text/html;charset=utf-8")
+    @ResponseBody
+    public String getproducts(String clientId) {
+        JSONObject jsonObject = new JSONObject();
+
+        if(StringUtils.isEmpty(clientId)){
+            jsonObject.put("code", 1);
+            jsonObject.put("errmsg", "clientId为空");
+            return jsonObject.toJSONString();
+        }
+        LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
+        query.eq(TEquipment::getClientId,clientId);
+        List<TEquipment> list1 = equipmentService.list(query);
+        TEquipment equipment = list1.get(0);
+        LambdaQueryWrapper<TProduct> queryProduct = Wrappers.lambdaQuery();
+        queryProduct.eq(TProduct::getEquipmentId,equipment.getId());
+        List<TProduct> products = productService.list(queryProduct);
+//        TProduct tProduct = products.get(0);
+        for (TProduct product:products){
+            product.setCreateDate(null);
+            product.setModifyDate(null);
+        }
+//        jsonObject.put("code", 0);
+//        jsonObject.put("productions", JsonUtils.toJson(list));
+//        jsonObject.put("errmsg", "");
+//        jsonObject.put("total", list.size());
+//        return jsonObject.toJSONString();
+        JSONObject jsonObject1 = new JSONObject();
+        jsonObject1.put("code", 0);
+        jsonObject1.put("data", JSONObject.toJSON(products).toString());
+        jsonObject1.put("errmsg", "");
+//        return jsonObject1.toString();
+        return JSONObject.toJSON(products).toString();
+    }
 //    @ApiOperation(value = "分页查询")
 //    @GetMapping("/testPage")
 //    public ResponseModel<IPage<?>> testPage(TAdminParam param) {
@@ -1512,7 +1550,7 @@ public class IndexController { ;
 //        return JsonMessage.success("success");
         return "success";
     }
-    //验证优惠码
+    //修改机器的分销
     @RequestMapping(value = "/updateProportion.htm", method = RequestMethod.GET, produces = "text/html;charset=utf-8")
     @ResponseBody
     public String updateProportion(String clientId) {
@@ -1523,7 +1561,6 @@ public class IndexController { ;
         if(equipment!=null&&equipment.getId()!=null){
             TAdmin admin = adminService.getById(equipment.getAdminId());
             String name = admin.getName();
-            if(StringUtils.isNotEmpty(name)&&name.substring(name.length()-1).equals("x")){
                 //查询机器是否已经有设置分销
                 LambdaQueryWrapper<TProportion> query1 = Wrappers.lambdaQuery();
                 query1.eq(TProportion::getClientId,equipment.getClientId());
@@ -1534,33 +1571,34 @@ public class IndexController { ;
                 }else {
                     //没有，需要创建
                     //1，判断是否新机器
-                    Date createDate = equipment.getCreateDate();
-                    long time = createDate.getTime();
-                    DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                    String  day= "2022-09-21 23:59:59";
-                    try {
-                        Date parse = simpleDateFormat.parse(day);
-                        if(time>parse.getTime()){
-                            return "新机器，不能已此方式生成分销！";
-                        }
-                    } catch (ParseException e) {
-                        e.printStackTrace();
-                    }
+//                    Date createDate = equipment.getCreateDate();
+//                    long time = createDate.getTime();
+//                    DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                    String  day= "2022-09-21 23:59:59";
+//                    try {
+//                        Date parse = simpleDateFormat.parse(day);
+//                        if(time>parse.getTime()){
+//                            return "新机器，不能已此方式生成分销！";
+//                        }
+//                    } catch (ParseException e) {
+//                        e.printStackTrace();
+//                    }
                     //先找到原账户的分销
                     LambdaQueryWrapper<TProportion> query2 = Wrappers.lambdaQuery();
                     query2.eq(TProportion::getAdminId,admin.getId());
                     List<TProportion> list2 = proportionService.list(query2);
                     if(list2.size()>0){
                         TProportion adminProportion = list2.get(0);
-                        TProportion equipmentProportion = new TProportion();
-                        equipmentProportion.setCreateDate(new Date());
-                        equipmentProportion.setModifyDate(new Date());
-                        equipmentProportion.setAdminId(admin.getId());
-                        equipmentProportion.setClientId(equipment.getClientId());
-                        equipmentProportion.setEquipmentId(equipment.getId());
-                        equipmentProportion.setAdminProportion(adminProportion.getAdminProportion());
-                        Integer type = adminProportion.getType();
-                        switch (type) {
+                        if(StringUtils.isEmpty(adminProportion.getClientId())){
+                            TProportion equipmentProportion = new TProportion();
+                            equipmentProportion.setCreateDate(new Date());
+                            equipmentProportion.setModifyDate(new Date());
+                            equipmentProportion.setAdminId(admin.getId());
+                            equipmentProportion.setClientId(equipment.getClientId());
+                            equipmentProportion.setEquipmentId(equipment.getId());
+                            equipmentProportion.setAdminProportion(adminProportion.getAdminProportion());
+                            Integer type = adminProportion.getType();
+                            switch (type) {
                                 case 1:
                                     equipmentProportion.setProportion(adminProportion.getAgencyProportion());
                                     equipmentProportion.setAgencyProportion(new BigDecimal("0.00"));
@@ -1571,11 +1609,14 @@ public class IndexController { ;
                                 case 2:
                                     equipmentProportion.setProportion(adminProportion.getMerchantProportion());
                                     equipmentProportion.setAgencyProportion(adminProportion.getAgencyProportion());
-                                    if(adminProportion.getAgencyProportion().compareTo(new BigDecimal("0.00"))!=0){
-                                        equipmentProportion.setAgencyId(admin.getAgencyId());
-                                        TAdmin byId = adminService.getById(admin.getAgencyId());
-                                        equipmentProportion.setAgencyName(byId.getUsername());
-                                    }
+//                                    if(adminProportion.getAgencyProportion().compareTo(new BigDecimal("0.00"))!=0){
+//                                        equipmentProportion.setAgencyId(admin.getAgencyId());
+//                                        TAdmin byId = adminService.getById(admin.getAgencyId());
+//                                        equipmentProportion.setAgencyName(byId.getUsername());
+//                                    }
+                                    equipmentProportion.setAgencyId(admin.getAgencyId());
+                                    TAdmin byId = adminService.getById(admin.getAgencyId());
+                                    equipmentProportion.setAgencyName(byId.getUsername());
                                     equipmentProportion.setMerchantProportion(new BigDecimal("0.00"));
                                     equipmentProportion.setPersonageProportion(new BigDecimal("0.00"));
                                     equipmentProportion.setType(1);
@@ -1583,27 +1624,35 @@ public class IndexController { ;
                                 case 3:
                                     equipmentProportion.setProportion(adminProportion.getPersonageProportion());
                                     equipmentProportion.setAgencyProportion(adminProportion.getAgencyProportion());
-                                    if(adminProportion.getAgencyProportion().compareTo(new BigDecimal("0.00"))!=0){
-                                        equipmentProportion.setAgencyId(admin.getAgencyId());
-                                        TAdmin byId = adminService.getById(admin.getAgencyId());
-                                        equipmentProportion.setAgencyName(byId.getUsername());
-                                    }
+//                                    if(adminProportion.getAgencyProportion().compareTo(new BigDecimal("0.00"))!=0){
+//                                        equipmentProportion.setAgencyId(admin.getAgencyId());
+//                                        TAdmin byId = adminService.getById(admin.getAgencyId());
+//                                        equipmentProportion.setAgencyName(byId.getUsername());
+//                                    }
+                                    equipmentProportion.setAgencyId(admin.getAgencyId());
+                                    TAdmin byId1 = adminService.getById(admin.getAgencyId());
+                                    equipmentProportion.setAgencyName(byId1.getUsername());
                                     equipmentProportion.setMerchantProportion(adminProportion.getMerchantProportion());
-                                    if(adminProportion.getMerchantProportion().compareTo(new BigDecimal("0.00"))!=0){
-                                        equipmentProportion.setMerchantId(admin.getMerchantId());
-                                        TAdmin byId = adminService.getById(admin.getMerchantId());
-                                        equipmentProportion.setMerchantName(byId.getUsername());
-                                    }
+//                                    if(adminProportion.getMerchantProportion().compareTo(new BigDecimal("0.00"))!=0){
+//                                        equipmentProportion.setMerchantId(admin.getMerchantId());
+//                                        TAdmin byId = adminService.getById(admin.getMerchantId());
+//                                        equipmentProportion.setMerchantName(byId.getUsername());
+//                                    }
+                                    equipmentProportion.setMerchantId(admin.getMerchantId());
+                                    TAdmin byId2 = adminService.getById(admin.getMerchantId());
+                                    equipmentProportion.setMerchantName(byId2.getUsername());
                                     equipmentProportion.setPersonageProportion(new BigDecimal("0.00"));
                                     equipmentProportion.setType(2);
-                                break;
+                                    break;
                             }
-                        boolean save = proportionService.save(equipmentProportion);
+                            boolean save = proportionService.save(equipmentProportion);
+                        }
+
                     }else {
                         return "原账户没有设置分销！";
                     }
                 }
-            }
+
         }
         return "success";
     }

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

@@ -407,22 +407,27 @@ public class TAdminController {
             admin.setIsLocked(false);
             //默认是商家
             admin.setType(2);
-            admin.setIsAdmined(true);
+//            admin.setIsAdmined(true);
             admin.setPassword(admin.getPassword());
 //            admin.setPassword(DigestUtils.md5Hex(admin.getPassword()));
             boolean b = tAdminService.save(admin);
 
             tMessageCodeService.saveOrUpdate(tMessageCode);
             if(b){
-                //todo 绑定商家角色
+                // 绑定商家角色
                 LambdaQueryWrapper<SysRole> query4 = Wrappers.lambdaQuery();
                 query4.eq(SysRole::getAdminId,"1");
                 query4.eq(SysRole::getRoleName,"商家");
                 List<SysRole> list2 = sysRoleService.list(query4);
                 if(list2.size()>0){
                     SysRole sysRole = list2.get(0);
+                    SysRole newSysRole =new SysRole();
+                    newSysRole.setAdminId(admin.getId());
+                    newSysRole.setMenuCodesJson(sysRole.getMenuCodesJson());
+                    newSysRole.setRoleName("商家");
+                    sysRoleService.save(newSysRole);
                     SysUserRole sysUserRole = new SysUserRole();
-                    sysUserRole.setRoleId(sysRole.getRoleId());
+                    sysUserRole.setRoleId(newSysRole.getRoleId());
                     sysUserRole.setUserId(String.valueOf(admin.getId()));
                     boolean save = sysUserRoleService.save(sysUserRole);
                 }
@@ -501,8 +506,29 @@ public class TAdminController {
     @ApiOperation(value = "获取账号信息")
     @GetMapping("/getAdmin")
     public ResponseModel<TAdmin> getAdmin(@RequestParam String id) {
-        TAdmin tAdmin = tAdminService.getById(id);
-        return R.ok(tAdmin);
+//        TAdmin tAdmin = tAdminService.getById(id);
+        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
+//        query.eq(TAdmin::getUsername,username);
+        query.eq(TAdmin::getId,id);
+        TAdmin tAdmin = Optional.ofNullable(tAdminService.getOnly(query))
+                .orElseThrow(() -> new BizException(ResponseCodesEnum.L0002));
+        if(StringUtils.isEmpty(tAdmin.getManagerId())){
+            String managerId = AdminUtils.encrypt(false, tAdmin.getId());
+            tAdmin.setManagerId(managerId);
+            tAdminService.getById(tAdmin);
+        }
+        UserDetailBO userDetailBO = BeanUtil.copyProperties(tAdmin,UserDetailBO.class);
+
+//        String token = IdUtil.simpleUUID();
+//        userDetailBO.setCurrentToken(token);
+//        // 获取拥有的权限菜单
+//        Set<String> menuList = sysRoleService.listAuthMenuByUserId(userDetailBO.getId());
+//        userDetailBO.setMenuCodeList(CollUtil.newArrayList(menuList));
+        // 抹除密码
+//        userDetailBO.setPassword(null);
+        // 保存到redis
+//        tokenManager.saveAuthentication(token,userDetailBO);
+        return R.ok(userDetailBO);
     }
 
     @ApiOperation(value = "获取账号列表 分页")
@@ -548,9 +574,17 @@ public class TAdminController {
     @PostMapping("/update")
     @Transactional
     public ResponseModel<?> update(@RequestBody TAdmin admin) {
+        if(StringUtils.isEmpty(admin.getUsername())&&admin.getId()==null){
+            return R.fail(ResponseCodesEnum.A0001,"参数空");
+        }
         //校验是否有重复的
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
-        query.eq(TAdmin::getUsername,admin.getUsername());
+        if (StringUtils.isNotEmpty(admin.getUsername())){
+            query.eq(TAdmin::getUsername,admin.getUsername());
+        }
+        if (admin.getId()!=null){
+            query.eq(TAdmin::getId,admin.getId());
+        }
         List<TAdmin> list = tAdminService.list(query);
         TAdmin oldAdmin = list.get(0);
         if(StringUtils.isNotEmpty(admin.getPassword())){
@@ -559,6 +593,9 @@ public class TAdminController {
         if(StringUtils.isNotEmpty(admin.getName())){
             oldAdmin.setName(admin.getName());
         }
+        if(admin.getAreaId()!=null){
+            oldAdmin.setAreaId(admin.getAreaId());
+        }
         if(StringUtils.isNotEmpty(admin.getIfForeign())){
             oldAdmin.setIfForeign(admin.getIfForeign());
         }
@@ -585,11 +622,11 @@ public class TAdminController {
         }
         oldAdmin.setModifyDate(new Date());
         tAdminService.updateById(oldAdmin);
-        return R.ok();
+        return R.ok(null,"修改成功");
     }
 
     @ApiOperation(value = "绑定上级账户")
-    @PostMapping("/setRelationAdmin")
+    @GetMapping("/setRelationAdmin")
     @Transactional
     public ResponseModel<?> setRelationAdmin(Long adminId,String username) {
         TAdmin admin = tAdminService.getById(adminId);
@@ -615,7 +652,7 @@ public class TAdminController {
         }else {
             return R.fail(ResponseCodesEnum.A0001);
         }
-        return R.ok();
+        return R.ok(null,"绑定成功");
     }
 
     @ApiOperation(value = "获取所有关联(下级)账号信息")
@@ -644,8 +681,11 @@ public class TAdminController {
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
         query.eq(TAdmin::getUsername,username);
         List<TAdmin> list = tAdminService.list(query);
-        TAdmin tAdmin = list.get(0);
-        return R.ok(tAdmin);
+        if(list.size()>0){
+            TAdmin tAdmin = list.get(0);
+            return R.ok(tAdmin);
+        }
+        return R.ok();
     }
     @ApiOperation(value = "获取上级账号名")
     @GetMapping("/getRelationAdminUsername")
@@ -653,5 +693,36 @@ public class TAdminController {
         TAdmin admin = tAdminService.getById(relationAdminId);
         return admin.getUsername();
     }
+
+    @ApiOperation(value = "批量设置账户的角色")
+    @GetMapping("/setRole")
+    public ResponseModel<?> setRole() {
+        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
+        query.eq(TAdmin::getType,"2");
+        List<TAdmin> list = tAdminService.list(query);
+        if(list.size()>0){
+            for(TAdmin admin:list){
+                // 绑定商家角色
+                LambdaQueryWrapper<SysRole> query4 = Wrappers.lambdaQuery();
+                query4.eq(SysRole::getAdminId,"1");
+                query4.eq(SysRole::getRoleName,"商家");
+                List<SysRole> list2 = sysRoleService.list(query4);
+                if(list2.size()>0){
+                    SysRole sysRole = list2.get(0);
+                    SysRole newSysRole =new SysRole();
+                    newSysRole.setAdminId(admin.getId());
+                    newSysRole.setMenuCodesJson(sysRole.getMenuCodesJson());
+                    newSysRole.setRoleName("商家");
+                    sysRoleService.save(newSysRole);
+                    SysUserRole sysUserRole = new SysUserRole();
+                    sysUserRole.setRoleId(newSysRole.getRoleId());
+                    sysUserRole.setUserId(String.valueOf(admin.getId()));
+                    boolean save = sysUserRoleService.save(sysUserRole);
+                }
+            }
+        }
+
+        return R.ok();
+    }
 }
 

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

@@ -40,6 +40,7 @@ public class TApkInfoController {
     @GetMapping("/pageApkInfo")
     public ResponseModel<IPage<?>> pagePromoCode(long current, long size ) {
         LambdaQueryWrapper<TApkInfo> query = Wrappers.lambdaQuery();
+        query.orderByDesc(TApkInfo::getCreateDate);
         Page<TApkInfo> page = new Page<>(current, size, true);
         IPage<TApkInfo> iPage = tApkInfoService.page(page, query);
         return R.ok(iPage);
@@ -54,7 +55,7 @@ public class TApkInfoController {
         tApkInfo.setCreateDate(new Date());
         tApkInfo.setModifyDate(new Date());
         tApkInfoService.save(tApkInfo);
-        return R.ok(tApkInfo);
+        return R.ok(tApkInfo,"添加成功");
     }
     @ApiOperation(value = "修改")
     @PostMapping("/update")
@@ -64,7 +65,26 @@ public class TApkInfoController {
         }
         tApkInfo.setModifyDate(new Date());
         tApkInfoService.updateById(tApkInfo);
-        return R.ok(tApkInfo);
+        return R.ok(tApkInfo,"修改成功");
+    }
+    /**
+     *
+     *
+     * @param
+     * @return
+     */
+    @GetMapping(value = "/deletes")
+    @ResponseBody
+    public ResponseModel<?> deletes(int[] ids) {
+        if(ids==null){
+            return R.fail(ResponseCodesEnum.A0001);
+        }
+        if(ids.length>0){
+            for(int i=0;i<ids.length;i++){
+                tApkInfoService.removeById(ids[i]);
+            }
+        }
+        return  R.ok(null,"删除成功");
     }
 }
 

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

@@ -1,10 +1,27 @@
 package com.szwl.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.constant.ResponseCodesEnum;
+import com.szwl.model.bean.AreaDTO;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TAd;
+import com.szwl.model.entity.TAdmin;
+import com.szwl.model.entity.TArea;
+import com.szwl.service.TAdminService;
+import com.szwl.service.TAreaService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  *  前端控制器
@@ -16,6 +33,113 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/tArea")
 public class TAreaController {
+    @Autowired
+    TAreaService areaService;
+    @ApiOperation(value = "")
+    @GetMapping("/getArea")
+    public ResponseModel<?> getArea(Long value) {
+        List<AreaDTO> areaDTOList = new ArrayList<>();
+        LambdaQueryWrapper<TArea> query = Wrappers.lambdaQuery();
+        if(value==null){
+            //获取顶级地址
+            query.eq(TArea::getTreePath,",");
+        }else {
+            query.eq(TArea::getParent,value);
+        }
+        List<TArea> list = areaService.list(query);
+        Boolean hasChild = false;
+        for(int i = 0;i<list.size();i++){
+            AreaDTO areaDTO = new AreaDTO();
+            areaDTO.setText(list.get(i).getName());
+            areaDTO.setValue(list.get(i).getId());
+            if(list.get(i).getTreePath().equals(",")){
+                areaDTO.setHasChildren(true);
+            }else {
+                String[] split = list.get(i).getTreePath().split(",");
+                if(split.length==2){
+                    if(i==1){
+                        LambdaQueryWrapper<TArea> query1 = Wrappers.lambdaQuery();
+                        query1.eq(TArea::getParent,list.get(i).getId());
+                        List<TArea> list1 = areaService.list(query1);
+                        if(list1.size()>0){
+                            hasChild=true;
+                        }
+                    }
+                    areaDTO.setHasChildren(hasChild);
+                }else {
+                    areaDTO.setHasChildren(false);
+                }
+            }
 
+            areaDTOList.add(areaDTO);
+        }
+        return R.ok(areaDTOList);
+    }
+    @ApiOperation(value = "")
+    @GetMapping("/getById")
+    public ResponseModel<?> getById(Long value) {
+        List<AreaDTO> areaDTOList = new ArrayList<>();
+        TArea area1 = areaService.getById(value);
+        if(area1.getParent()==null){
+            //省级
+            AreaDTO areaDTO = new AreaDTO();
+            areaDTO.setText(area1.getName());
+            areaDTO.setValue(area1.getId());
+            areaDTO.setHasChildren(true);
+            areaDTOList.add(areaDTO);
+        }else {
+            List<AreaDTO> areaDTOList1 = new ArrayList<>();
+            TArea byId = areaService.getById(area1.getParent());
+            if(byId.getParent()==null){
+                //省级
+                AreaDTO areaDTO = new AreaDTO();
+                areaDTO.setText(byId.getName());
+                areaDTO.setValue(byId.getId());
+                areaDTO.setHasChildren(true);
+                //市级
+                AreaDTO areaDTO1 = new AreaDTO();
+                areaDTO1.setText(area1.getName());
+                areaDTO1.setValue(area1.getId());
+                String[] split = area1.getTreePath().split(",");
+                if(split.length==2){
+                    LambdaQueryWrapper<TArea> query1 = Wrappers.lambdaQuery();
+                    query1.eq(TArea::getParent,area1.getId());
+                    List<TArea> list1 = areaService.list(query1);
+                    if(list1.size()>0){
+                        areaDTO1.setHasChildren(true);
+                    }
+                }
+                areaDTOList1.add(areaDTO1);
+                areaDTO.setChildren(areaDTOList1);
+                areaDTOList.add(areaDTO);
+            }else {
+                List<AreaDTO> areaDTOList2 = new ArrayList<>();
+                TArea area = areaService.getById(byId.getParent());
+                //省级
+                AreaDTO areaDTO = new AreaDTO();
+                areaDTO.setText(area.getName());
+                areaDTO.setValue(area.getId());
+                //市级
+                AreaDTO areaDTO1 = new AreaDTO();
+                areaDTO1.setText(byId.getName());
+                areaDTO1.setValue(byId.getId());
+                areaDTO1.setHasChildren(true);
+                //镇/区
+                AreaDTO areaDTO2 = new AreaDTO();
+                areaDTO2.setText(area1.getName());
+                areaDTO2.setValue(area1.getId());
+                //镇/区入列
+                areaDTOList2.add(areaDTO2);
+                //镇列入市
+                areaDTO1.setChildren(areaDTOList2);
+                //市入列
+                areaDTOList1.add(areaDTO1);
+                //市列入省
+                areaDTO.setChildren(areaDTOList1);
+                areaDTOList.add(areaDTO);
+            }
+        }
+        return R.ok(areaDTOList);
+    }
 }
 

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.model.bean.*;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
@@ -49,6 +50,8 @@ public class TEquipmentController {
     @Autowired
     TEquipmentService tEquipmentService;
     @Autowired
+    TEquipmentDescService equipmentDescService;
+    @Autowired
     TAdminService tAdminService;
     @Autowired
     TParametersService parametersService;
@@ -162,6 +165,18 @@ public class TEquipmentController {
             }else {
                 equipmentDTO.setHasTodayAlarm(false);
             }
+            TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipmentDTO.getId());
+            if(equipmentDesc!=null){
+                equipmentDTO.setRedSugar(equipmentDesc.getRedSugar());
+                equipmentDTO.setWasteWater(equipmentDesc.getWasteWater());
+                equipmentDTO.setWater(equipmentDesc.getWater());
+                equipmentDTO.setYellowSugar(equipmentDTO.getYellowSugar());
+                equipmentDTO.setBlueSugar(equipmentDesc.getBlueSugar());
+                equipmentDTO.setIsMaterialUse(equipmentDesc.getIsMaterialUse());
+                equipmentDTO.setStick(equipmentDesc.getStick());
+                equipmentDTO.setWhiteSugar(equipmentDesc.getWhiteSugar());
+            }
+
         }
         iPageDTO.setRecords(equipmentDTOList);
         return R.ok(iPageDTO);
@@ -178,7 +193,7 @@ public class TEquipmentController {
     @GetMapping("/findEquipmentByClientId")
     public ResponseModel<TEquipment> findEquipmentByClientId(@RequestParam String  clientId) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
-        query.like(TEquipment::getClientId,clientId);
+        query.eq(TEquipment::getClientId,clientId);
         List<TEquipment> list = tEquipmentService.list(query);
         TEquipment equipment = list.get(0);
         return R.ok(equipment);
@@ -627,6 +642,31 @@ public class TEquipmentController {
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new ResultMessage().setCode(true).setData("").setMessage("发送成功！"));
     }
+    //一键补料
+    @ApiOperation(value = "一键补料")
+    @GetMapping("/buliao")
+    public ResponseModel<?> buliao(String equipmentId) {
+
+        TEquipment equipment = tEquipmentService.getById(equipmentId);
+        if(equipment==null||equipment.getId()==null){
+            return R.fail(ResponseCodesEnum.A0001,"找不到设备");
+        }
+        TEquipmentDesc tEquipmentDesc = equipmentDescService.getById(equipment.getId());
+        if (tEquipmentDesc!=null){
+            tEquipmentDesc.setBlueSugar("100");
+            tEquipmentDesc.setRedSugar("100");
+            tEquipmentDesc.setStick("100");
+            tEquipmentDesc.setWhiteSugar("100");
+            tEquipmentDesc.setYellowSugar("100");
+            tEquipmentDesc.setWater("100");
+            tEquipmentDesc.setWasteWater("0");
+            equipmentDescService.updateById(tEquipmentDesc);
+            tEquipmentService.sentMessage(equipment.getClientId(),PushUtils.buildJson("buliao", "buliao").toString());
+        }else {
+            return R.fail(ResponseCodesEnum.A0001,"找不到设备");
+        }
+        return R.ok(null,"修改成功");
+    }
     //查找设备
     @ApiOperation(value = "查找设备")
     @PostMapping("/findEquipment")
@@ -639,7 +679,7 @@ public class TEquipmentController {
     //获取机器数量
     @ApiOperation(value = "获取机器数量")
     @PostMapping("/getMachineNum")
-    public ResponseEntity<?> getMachineNum(@RequestBody StatisticsParam param) {
+    public ResponseModel<?> getMachineNum(@RequestBody StatisticsParam param) {
         String machineTotalNum = "";
         String machineUseNum = "";
         String equipmentId = param.getEquipmentId();
@@ -657,16 +697,13 @@ public class TEquipmentController {
             machineTotalNum = tEquipmentService.findMachineTotalNum(param);
             machineUseNum = tEquipmentService.findMachineUseNum(param);
         }
-
+        Map<String,String> map = new HashMap<>();
+        map.put("machineTotalNum",machineTotalNum);
+        map.put("machineUseNum",machineUseNum);
         List<String> list = new ArrayList<>();
         list.add(machineTotalNum);
         list.add(machineUseNum);
-        return ResponseEntity
-                .status(HttpStatus.OK)
-                .body(new ResultMessage()
-                        .setCode(true)
-                        .setData(list)
-                        .setMessage("SUCCESS"));
+        return R.ok(map,"获取成功");
     }
 
 

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

@@ -113,9 +113,10 @@ public class TLabelController {
     }
     @ApiOperation(value = "获取标签列表")
     @GetMapping("/list")
-    public ResponseModel<?> list(String adminId) {
+    public ResponseModel<?> list(String adminId,String type) {
         LambdaQueryWrapper<TLabel> query = Wrappers.lambdaQuery();
         query.like(TLabel::getAdminId,adminId);
+        query.like(TLabel::getType,type);
         List<TLabel> list = labelService.list(query);
         return R.ok(list);
     }
@@ -154,7 +155,7 @@ public class TLabelController {
         return R.ok(label);
     }
     @ApiOperation(value = "修改标签")
-    @GetMapping("/update")
+    @PostMapping("/update")
     public ResponseModel<?> update(@RequestBody TLabel label) {
         if(StringUtils.isNotEmpty(label.getName())&&StringUtils.isNotEmpty(label.getType())&&label.getAdminId()!=null){
             label.setModifyDate(new Date());

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

@@ -1,63 +1,21 @@
 package com.szwl.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.szwl.constant.ResponseCodesEnum;
-import com.szwl.model.bo.R;
-import com.szwl.model.bo.ResponseModel;
-import com.szwl.model.entity.TAdmin;
-import com.szwl.model.entity.TLogo;
-import com.szwl.model.utils.AdminUtils;
-import com.szwl.service.TAdminService;
-import com.szwl.service.TLogoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * <p>
- * 用户定制logo 前端控制器
+ *  前端控制器
  * </p>
  *
  * @author wuhs
- * @since 2022-09-26
+ * @since 2022-11-24
  */
-@Api(value = "/tLogo", tags = {"logo"})
 @RestController
 @RequestMapping("/tLogo")
 public class TLogoController {
-    @Autowired
-    TAdminService tAdminService;
-    @Autowired
-    TLogoService logoService;
-    @ApiOperation(value = "查询是否有定制logo")
-    @GetMapping("/getLogo")
-    public ResponseModel<?> getLogo(String relationAdminId) {
-        if(StringUtils.isEmpty(relationAdminId)){
-            return  R.fail(ResponseCodesEnum.A0001);
-        }
-        Long adminId = AdminUtils.decrypt(false, relationAdminId);
-        TAdmin admin = tAdminService.getById(adminId);
-        if(admin!=null&&admin.getId()!=null){
-            LambdaQueryWrapper<TLogo> query = Wrappers.lambdaQuery();
-            query.eq(TLogo::getAdminId,adminId);
-            List<TLogo> list = logoService.list(query);
-            if(list.size()>0){
-                return R.ok(list.get(0));
-            }else {
-                return  R.fail(ResponseCodesEnum.A0206);
-            }
-        }
 
-        return  R.fail(ResponseCodesEnum.A0206);
-    }
 }
 

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

@@ -0,0 +1,81 @@
+package com.szwl.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.constant.ResponseCodesEnum;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TAdmin;
+import com.szwl.model.entity.TNotice;
+import com.szwl.service.TAdminService;
+import com.szwl.service.TNoticeService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-11-23
+ */
+@RestController
+@RequestMapping("/tNotice")
+public class TNoticeController {
+    @Autowired
+    TAdminService tAdminService;
+    @Autowired
+    TNoticeService noticeService;
+    @ApiOperation(value = "获取公告")
+    @GetMapping("/getNotice")
+    public ResponseModel<?> getNotice(String id) {
+        if(StringUtils.isEmpty(id)){
+            return R.fail(ResponseCodesEnum.A0001,"数据有空");
+        }
+        TAdmin admin = tAdminService.getById(id);
+        LambdaQueryWrapper<TNotice> query = Wrappers.lambdaQuery();
+        if(admin.getNoticeId()!=null){
+            Long noticeId = admin.getNoticeId();
+            query.gt(TNotice::getId,noticeId);
+        }
+        query.eq(TNotice::getStatus,0);
+        query.gt(TNotice::getCreateDate,admin.getCreateDate());
+        List<TNotice> noticeList = noticeService.list(query);
+        if(noticeList.size()<1){
+            return R.ok(noticeList,"没有公告");
+        }else {
+            return R.ok(noticeList.get(0),"获取成功");
+        }
+    }
+    @GetMapping("/updateNotice")
+    public ResponseModel<?> updateNotice(String adminId,String noticeId) {
+        if(StringUtils.isEmpty(adminId)&&StringUtils.isEmpty(noticeId)){
+            return R.fail(ResponseCodesEnum.A0001,"数据有空");
+        }
+        TAdmin admin = tAdminService.getById(adminId);
+        Long adminNoticeId = admin.getNoticeId();
+        if(adminNoticeId!=null){
+            if(adminNoticeId<Long.valueOf(noticeId)){
+                admin.setNoticeId(Long.valueOf(noticeId));
+                tAdminService.updateById(admin);
+            }
+        }else {
+            admin.setNoticeId(Long.valueOf(noticeId));
+            tAdminService.updateById(admin);
+        }
+        return R.ok(null,"公告已读");
+    }
+}
+

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

@@ -60,6 +60,15 @@ public class TOrderController {
      */
     @PostMapping("/refund")
     public ResponseEntity<?> refund(@RequestBody TOrder torder) {
+        BigDecimal refusePrice = torder.getPrice().setScale(2, RoundingMode.HALF_DOWN);
+        if(refusePrice.compareTo(new BigDecimal("0.00"))<=0){
+            return ResponseEntity
+                    .status(HttpStatus.OK)
+                    .body(new ResultMessage()
+                            .setCode(false)
+                            .setData("")
+                            .setMessage("退款金额非法"));
+        }
         TOrder order = R.getDataIfSuccess(payFeign.getOrder(String.valueOf(torder.getId())));
         TEquipment equipment = tEquipmentService.getById(order.getEquipmentId());
         Long equipmentId = equipment.getId();
@@ -89,12 +98,47 @@ public class TOrderController {
 
         JSONArray altInfoArray = JSONArray.parseArray(order.getAltInfo());
         JSONArray altRefInfo = new JSONArray();
-        BigDecimal refusePrice = torder.getRefundAmount().setScale(2, RoundingMode.HALF_DOWN);
-        if(refusePrice.compareTo(new BigDecimal("0.00"))==0){
-            refusePrice = torder.getPrice();
-        }
+//        BigDecimal refusePrice = torder.getRefundAmount().setScale(2, RoundingMode.HALF_DOWN);
+//        if(refusePrice.compareTo(new BigDecimal("0.00"))==0){
+//            refusePrice = torder.getPrice();
+//        }
         BigDecimal p = BigDecimal.ZERO;
         BigDecimal price = BigDecimal.ZERO;
+        //订单总金额
+        BigDecimal sumPrice = BigDecimal.ZERO;
+        if(order.getRefundAmount()!=null){
+            sumPrice=sumPrice.add(order.getPrice()).add(order.getRefundAmount()).setScale(2, RoundingMode.HALF_DOWN);
+        }else {
+            sumPrice=sumPrice.add(order.getPrice()).setScale(2, RoundingMode.HALF_DOWN);
+        }
+//        for (int i = 0; i < altInfoArray.size(); i++) {
+//            JSONObject altInfoObject = altInfoArray.getJSONObject(i);
+//
+//            JSONObject refInfo = new JSONObject();
+//            refInfo.put("altMchNo", altInfoObject.getString("altMchNo"));
+//            String altAmount = altInfoObject.getString("altAmount");
+//
+//            BigDecimal pri = new BigDecimal(order.getPrice().toString()).setScale(2, RoundingMode.HALF_DOWN);
+//
+//            if(refusePrice.compareTo(pri)<0){
+//                //退部分的钱
+//                BigDecimal altAmountPrice = new BigDecimal(altAmount);
+//                altAmountPrice = altAmountPrice.multiply(refusePrice.divide(pri)).setScale(2, RoundingMode.HALF_DOWN);
+//                p = p.add(altAmountPrice);
+//                refInfo.put("altRefAmount", altAmountPrice.toString());
+//            }else {
+//                //退全部的钱
+//                BigDecimal altAmountPrice = new BigDecimal(altAmount);
+//                p = p.add(altAmountPrice);
+//                refInfo.put("altRefAmount", altInfoObject.getString("altAmount"));
+//            }
+//
+//
+//            price = price.add(altInfoObject.getBigDecimal("altAmount"));
+//            if (!altInfoObject.getBigDecimal("altAmount").toString().equals("0.00")) {
+//                altRefInfo.add(refInfo);
+//            }
+//        }
         for (int i = 0; i < altInfoArray.size(); i++) {
             JSONObject altInfoObject = altInfoArray.getJSONObject(i);
 
@@ -107,14 +151,32 @@ public class TOrderController {
             if(refusePrice.compareTo(pri)<0){
                 //退部分的钱
                 BigDecimal altAmountPrice = new BigDecimal(altAmount);
-                altAmountPrice = altAmountPrice.multiply(refusePrice.divide(pri)).setScale(2, RoundingMode.HALF_DOWN);
+//                if(order.getRefundAmount()!=null){
+//                    altAmountPrice = altAmountPrice.multiply(refusePrice.divide(sumPrice.subtract(BigDecimal.valueOf(order.getRefundAmount())))).setScale(2, RoundingMode.HALF_DOWN);
+//                }else {
+//
+////                    altAmountPrice = altAmountPrice.multiply(refusePrice.divide(pri)).setScale(2, RoundingMode.HALF_DOWN);
+//                };
+                altAmountPrice = refusePrice.multiply(altAmountPrice.divide(sumPrice,2,BigDecimal.ROUND_HALF_UP)).setScale(2, RoundingMode.HALF_DOWN);
                 p = p.add(altAmountPrice);
                 refInfo.put("altRefAmount", altAmountPrice.toString());
             }else {
                 //退全部的钱
-                BigDecimal altAmountPrice = new BigDecimal(altAmount);
+//                if(order.getRefundAmount()!=null){
+//                    BigDecimal altAmountPrice = new BigDecimal(altAmount);
+//                    p = p.add(altAmountPrice);
+//                    refInfo.put("altRefAmount", altInfoObject.getString("altAmount"));
+//                }else{
+//                    BigDecimal altAmountPrice = new BigDecimal(altAmount);
+//                    p = p.add(altAmountPrice);
+//                    refInfo.put("altRefAmount", altInfoObject.getString("altAmount"));
+//                }
+                BigDecimal altAmountPrice = new BigDecimal(altAmount).setScale(2, RoundingMode.HALF_DOWN);
+                BigDecimal divide = altAmountPrice.divide(sumPrice,2,BigDecimal.ROUND_HALF_UP).setScale(2, RoundingMode.HALF_DOWN);
+                altAmountPrice = refusePrice.multiply(divide).setScale(2, RoundingMode.HALF_DOWN);
                 p = p.add(altAmountPrice);
-                refInfo.put("altRefAmount", altInfoObject.getString("altAmount"));
+                refInfo.put("altRefAmount", altAmountPrice.toString());
+
             }
 
 
@@ -131,10 +193,11 @@ public class TOrderController {
         refInfo.put("altMchNo", JoinpayConstant.mch_no);
         refInfo.put("altRefAmount", adminPrice.toString());
         price = price.add(adminPrice);
-        if (!adminPrice.toString().toString().equals("0.00")) {
+        if (!adminPrice.toString().equals("0.00")) {
             altRefInfo.add(refInfo);
         }
         String text = "";
+        BigDecimal p8_MarketRefAmount = order.getMarketingAmount().multiply(refusePrice.divide(sumPrice,2,BigDecimal.ROUND_HALF_UP)).setScale(2, RoundingMode.HALF_DOWN);
         //需要知道订单是哪一个平台的，不能以账号的为标准  0或null为汇聚，1为杉德支付
         String payPlatform = order.getPayPlatform();
         if (StringUtils.isNotEmpty(payPlatform) && payPlatform.equals("1")) {
@@ -295,18 +358,18 @@ public class TOrderController {
             }
         } else {
             try {
-                String result = orderService.refund(order.getSn(), orderService.initRefundSn(equipmentId), refusePrice, "", notifyUrl, altRefInfo.toString());
-                if (Constant.correct_code.equals(result)) {
+                String result = orderService.refund(order.getSn(), orderService.initRefundSn(equipmentId), refusePrice, p8_MarketRefAmount,"", notifyUrl, altRefInfo.toString());
+                if ("退款申请成功".equals(result)) {
                     order.setStatus(2);
+                    order.setRefundTrxNo(String.valueOf(torder.getRefundAmount()));
                     payFeign.updateOrder(order);
-//                    tOrderService.updateById(order);
                     return ResponseEntity
                             .status(HttpStatus.OK)
                             .body(new ResultMessage()
                                     .setCode(true)
                                     .setData("申请退款已成功")
                                     .setMessage("申请退款已成功"));
-                } else {
+                }else {
                     return ResponseEntity
                             .status(HttpStatus.OK)
                             .body(new ResultMessage()

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 import com.gexin.fastjson.JSON;
+import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -109,20 +110,21 @@ public class TProductController {
     }
     @ApiOperation(value = "/多个花型价格")
     @GetMapping("/updateProduct")
-    public ResponseEntity<?> updateProduct(String no,String price,String equipmentId,String type) {
-        if(StringUtils.isEmpty(no)||StringUtils.isEmpty(price)||StringUtils.isEmpty(equipmentId)){
-            return ResponseEntity.status(HttpStatus.OK)
-                    .body(new ResultMessage().setCode(false).setData("").setMessage("数据有空"));
+    public ResponseModel<?> updateProduct(String no,String price,String equipmentId,String type) {
+        if(StringUtils.isEmpty(price)||StringUtils.isEmpty(equipmentId)){
+            return R.fail(ResponseCodesEnum.A0001,"数据有空");
         }
         TEquipment equipment = tEquipmentService.getById(equipmentId);
-        if(equipment==null){
-            return ResponseEntity.status(HttpStatus.OK)
-                    .body(new ResultMessage().setCode(false).setData("").setMessage("请退出重试"));
+        if(equipment==null||equipment.getId()==null){
+            return R.fail(ResponseCodesEnum.A0001,"请退出重试");
         }
         //修改单个
         if(type.equals("0")){
             LambdaQueryWrapper<TProduct> query = Wrappers.lambdaQuery();
             query.eq(TProduct::getEquipmentId,Long.valueOf(equipmentId));
+            if(StringUtils.isEmpty(no)){
+                return R.fail(ResponseCodesEnum.A0001,"数据有空");
+            }
             query.eq(TProduct::getNo,no);
             List<TProduct> list = tProductService.list(query);
             if(list.size()>0){
@@ -148,8 +150,8 @@ public class TProductController {
             }
         }
         tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("updateProductsPrice", "0").toString());
-        return ResponseEntity.status(HttpStatus.OK)
-                .body(new ResultMessage().setCode(true).setData("").setMessage("修改成功"));
+        return R.ok(null,"修改成功");
+
     }
 
     @ApiOperation(value = "获取商品")
@@ -209,16 +211,17 @@ public class TProductController {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getAdminId,adminId);
         List<TEquipment> list = tEquipmentService.list(query);
+        List<TProduct> list1 = new ArrayList<>();
         if(list.size()>0){
             TEquipment equipment = list.get(0);
             LambdaQueryWrapper<TProduct> query1 = Wrappers.lambdaQuery();
             query1.eq(TProduct::getEquipmentId,equipment.getId());
-            List<TProduct> list1 = tProductService.list(query1);
+            list1 = tProductService.list(query1);
             return ResponseEntity.status(HttpStatus.OK)
                     .body(new ResultMessage().setCode(true).setData(list1).setMessage("SUCCESS"));
         }else {
             return ResponseEntity.status(HttpStatus.OK)
-                    .body(new ResultMessage().setCode(false).setData(null).setMessage(""));
+                    .body(new ResultMessage().setCode(false).setData(list1).setMessage(""));
         }
     }
 }

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

@@ -40,6 +40,7 @@ import java.util.*;
 
 import static com.szwl.constant.ResponseCodesEnum.A0001;
 import static com.szwl.constant.ResponseCodesEnum.A0002;
+import static com.szwl.constant.ResponseCodesEnum.A0202;
 import static com.szwl.model.utils.DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss;
 
 /**
@@ -78,6 +79,19 @@ public class TPromoCodeController {
         return R.ok(iPage);
     }
     @ApiOperation(value = "获取优惠码")
+    @GetMapping("/getPromoCode")
+    public ResponseModel<TPromoCode> getPromoCode(@RequestParam String  code) {
+        LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
+        String[] split = code.split("-");
+        query.eq(TPromoCode::getCode,split[0]);
+        query.eq(TPromoCode::getAdminId,split[1]);
+        List<TPromoCode> list = promoCodeService.list(query);
+        if(list.size()>0){
+            return R.ok(list.get(0));
+        }
+        return R.ok();
+    }
+    @ApiOperation(value = "获取优惠码")
     @GetMapping("/selectTPromoCode")
     public ResponseModel<TPromoCode> selectTPromoCode(@RequestParam String  code,@RequestParam String  adminId) {
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
@@ -152,6 +166,117 @@ public class TPromoCodeController {
                 promoCodeService.save(promoCode);
         }
     }
+    @ApiOperation(value = "生成5元优惠券")
+    @GetMapping("/addYHJ")
+    public ResponseModel<?> addYHJ(Long wxId,String flag) {
+        if(wxId==null||StringUtils.isEmpty(flag)){
+            return R.fail(A0001);
+        }
+        LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
+        query.eq(TPromoCode::getWxId,wxId);
+        if(flag.equals("YHJ5")||flag.equals("YHJ10")){
+            query.eq(TPromoCode::getType,"2");
+            List<TPromoCode> list = promoCodeService.list(query);
+            if(list.size()>0){
+                return R.fail(A0202,"已领取");
+            }
+        }
+        String code = orderService.initSn(Long.valueOf(wxId));
+        TPromoCode promoCode = new TPromoCode();
+        promoCode.setCreateDate(new Date());
+        promoCode.setModifyDate(new Date());
+        promoCode.setCode(Long.parseLong(code.substring(code.length()-8,code.length())));
+        promoCode.setAdminId(null);
+        promoCode.setIsUse("0");
+        if(flag.equals("YHJ5")){
+            promoCode.setDiscount(5f);
+            promoCode.setType("2");
+        }
+        if(flag.equals("YHJ10")){
+            promoCode.setDiscount(10f);
+            promoCode.setType("2");
+        }
+        Long data = Calendar.getInstance().getTimeInMillis();
+        Long t = 3l;
+        Long mon = 30L*24L*60L*60L*1000L;
+        Long d = data + (mon*t);
+        Date lastUseDate = new Date(Long.parseLong(String.valueOf(d)));
+        promoCode.setLastUseDate(lastUseDate);
+        promoCode.setCreateDate(new Date());
+        promoCode.setUserName(null);
+        promoCode.setWxId(wxId);
+        promoCodeService.save(promoCode);
+        return R.ok(promoCode,"领取成功");
+    }
+    @ApiOperation(value = "核销优惠券")
+    @GetMapping("/useYHJ")
+    public void useYHJ(@RequestParam String code,@RequestParam String adminId,@RequestParam String clentId) {
+        LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
+        query.eq(TPromoCode::getCode,code);
+        query.eq(TPromoCode::getIsUse,"0");
+        List<TPromoCode> list = promoCodeService.list(query);
+        if(list.size()>0){
+            TPromoCode promoCode = list.get(0);
+            promoCode.setUseDate(DateUtils.formatDate(new Date(), DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss));
+            promoCode.setAdminId(adminId);
+            promoCode.setUseBy(clentId);
+            promoCode.setIsUse("1");
+            promoCode.setModifyDate(new Date());
+            promoCodeService.updateById(promoCode);
+        }
+    }
+    @GetMapping("/getYHJList")
+    public ResponseModel<?> getYHJList(Long wxId) {
+        if(wxId==null){
+            return R.fail(A0001);
+        }
+        LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
+        query.eq(TPromoCode::getWxId,wxId);
+        query.eq(TPromoCode::getIsUse,"0");
+        query.eq(TPromoCode::getType,"2");
+        List<TPromoCode> list = promoCodeService.list(query);
+        return R.ok(list,"成功");
+    }
+    @GetMapping("/checkYHJList")
+    public ResponseModel<?> checkYHJList(Long wxId) {
+        if(wxId==null){
+            return R.fail(A0001);
+        }
+        LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
+        query.eq(TPromoCode::getWxId,wxId);
+        query.eq(TPromoCode::getType,"2");
+        List<TPromoCode> list = promoCodeService.list(query);
+        if(list.size()>0){
+            return R.ok(true,"已领取");
+        }else {
+            return R.ok(false,"未领取");
+        }
+
+    }
+    @GetMapping("/getYHJ")
+    public ResponseModel<TPromoCode> getYHJ(@RequestParam String code) {
+        if(StringUtils.isEmpty(code)){
+            return R.fail(A0001);
+        }
+        LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
+        query.eq(TPromoCode::getCode,code);
+        query.eq(TPromoCode::getType,"2");
+        List<TPromoCode> list = promoCodeService.list(query);
+        if(list.size()>0){
+            TPromoCode tPromoCode = list.get(0);
+//            String isUse = tPromoCode.getIsUse();
+//            if(isUse.equals("1")){
+//                return R.fail(A0002,"已使用");
+//            }
+//            Date lastUseDate = tPromoCode.getLastUseDate();
+//            Date date = new Date();
+//            if(date.getTime()>lastUseDate.getTime()){
+//                return R.fail(A0002,"已过期");
+//            }
+            return R.ok(tPromoCode);
+        }
+        return R.ok();
+    }
     @ApiOperation(value = "添加优惠码")
     @GetMapping("/add")
     public ResponseModel<?> add(Long adminId,int number,Float discount,Float month,String type,String frpCode) {

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

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -305,6 +306,7 @@ public class TProportionController {
                 tProportion.setAgencyId(agencyId);
                 tProportion.setMerchantId(merchantId);
                 tProportion.setPersonageId(personageId);
+                tProportion.setEquipmentId(equipment.getId());
                 tProportion.setAgencyProportion(BigDecimal.valueOf(0.00));
                 tProportion.setMerchantProportion(BigDecimal.valueOf(0.00));
                 tProportion.setPersonageProportion(BigDecimal.valueOf(0.00));
@@ -373,5 +375,138 @@ public class TProportionController {
         TProportion tProportion = list.get(0);
         return R.ok(tProportion);
     }
+    @ApiOperation(value = "")
+    @GetMapping("/setProportion")
+    public ResponseModel<?> setProportion() {
+        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
+        query.eq(TAdmin::getIfForeign,"0");
+        List<TAdmin> list = adminService.list(query);
+        List<TEquipment> equipmentList = new ArrayList<>();
+        if(list.size()>0){
+            for(TAdmin admin:list){
+                LambdaQueryWrapper<TEquipment> query1 = Wrappers.lambdaQuery();
+                query1.eq(TEquipment::getAdminId,admin.getId());
+                List<TEquipment> list1 = tEquipmentService.list(query1);
+                if(list1.size()>0){
+                    for(TEquipment equipment:list1){
+                        String s = equipment.getClientId().substring(equipment.getClientId().length() - 1, equipment.getClientId().length());
+                        if(!s.equals("x")){
+                            equipmentList.add(equipment);
+                        }
+                    }
+                }
+            }
+        }
+        if(equipmentList.size()>0){
+            for(TEquipment equipment:equipmentList){
+                String clientId = equipment.getClientId();
+                LambdaQueryWrapper<TEquipment> query2 = Wrappers.lambdaQuery();
+                query2.eq(TEquipment::getClientId,clientId);
+                List<TEquipment> list2 = tEquipmentService.list(query2);
+                TEquipment equipment1 = list2.get(0);
+                if(equipment1!=null&&equipment1.getId()!=null){
+                    TAdmin admin = adminService.getById(equipment1.getAdminId());
+                    String name = admin.getName();
+                    //查询机器是否已经有设置分销
+                    LambdaQueryWrapper<TProportion> query1 = Wrappers.lambdaQuery();
+                    query1.eq(TProportion::getClientId,equipment1.getClientId());
+                    query1.eq(TProportion::getEquipmentId,equipment1.getId());
+                    List<TProportion> list1 = tProportionService.list(query1);
+                    if(list1.size()>0){
+                        //已有
+                    }else {
+                        //没有，需要创建
+                        //1，判断是否新机器
+//                    Date createDate = equipment.getCreateDate();
+//                    long time = createDate.getTime();
+//                    DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                    String  day= "2022-09-21 23:59:59";
+//                    try {
+//                        Date parse = simpleDateFormat.parse(day);
+//                        if(time>parse.getTime()){
+//                            return "新机器，不能已此方式生成分销！";
+//                        }
+//                    } catch (ParseException e) {
+//                        e.printStackTrace();
+//                    }
+                        //先找到原账户的分销
+                        LambdaQueryWrapper<TProportion> query3 = Wrappers.lambdaQuery();
+                        query3.eq(TProportion::getAdminId,admin.getId());
+                        List<TProportion> list3 = tProportionService.list(query3);
+                        if(list3.size()>0){
+                            TProportion adminProportion = list3.get(0);
+                            if(StringUtils.isEmpty(adminProportion.getClientId())){
+                                TProportion equipmentProportion = new TProportion();
+                                equipmentProportion.setCreateDate(new Date());
+                                equipmentProportion.setModifyDate(new Date());
+                                equipmentProportion.setAdminId(admin.getId());
+                                equipmentProportion.setClientId(equipment.getClientId());
+                                equipmentProportion.setEquipmentId(equipment.getId());
+                                equipmentProportion.setAdminProportion(adminProportion.getAdminProportion());
+                                Integer type = adminProportion.getType();
+                                if(type!=null){
+                                    switch (type) {
+                                        case 1:
+                                            equipmentProportion.setProportion(adminProportion.getAgencyProportion());
+                                            equipmentProportion.setAgencyProportion(new BigDecimal("0.00"));
+                                            equipmentProportion.setMerchantProportion(new BigDecimal("0.00"));
+                                            equipmentProportion.setPersonageProportion(new BigDecimal("0.00"));
+                                            equipmentProportion.setType(0);
+                                            break;
+                                        case 2:
+                                            equipmentProportion.setProportion(adminProportion.getMerchantProportion());
+                                            equipmentProportion.setAgencyProportion(adminProportion.getAgencyProportion());
+//                                    if(adminProportion.getAgencyProportion().compareTo(new BigDecimal("0.00"))!=0){
+//                                        equipmentProportion.setAgencyId(admin.getAgencyId());
+//                                        TAdmin byId = adminService.getById(admin.getAgencyId());
+//                                        equipmentProportion.setAgencyName(byId.getUsername());
+//                                    }
+                                            equipmentProportion.setAgencyId(admin.getAgencyId());
+                                            TAdmin byId = adminService.getById(admin.getAgencyId());
+                                            equipmentProportion.setAgencyName(byId.getUsername());
+                                            equipmentProportion.setMerchantProportion(new BigDecimal("0.00"));
+                                            equipmentProportion.setPersonageProportion(new BigDecimal("0.00"));
+                                            equipmentProportion.setType(1);
+                                            break;
+                                        case 3:
+                                            equipmentProportion.setProportion(adminProportion.getPersonageProportion());
+                                            equipmentProportion.setAgencyProportion(adminProportion.getAgencyProportion());
+//                                    if(adminProportion.getAgencyProportion().compareTo(new BigDecimal("0.00"))!=0){
+//                                        equipmentProportion.setAgencyId(admin.getAgencyId());
+//                                        TAdmin byId = adminService.getById(admin.getAgencyId());
+//                                        equipmentProportion.setAgencyName(byId.getUsername());
+//                                    }
+                                            equipmentProportion.setAgencyId(admin.getAgencyId());
+                                            TAdmin byId1 = adminService.getById(admin.getAgencyId());
+                                            equipmentProportion.setAgencyName(byId1.getUsername());
+                                            equipmentProportion.setMerchantProportion(adminProportion.getMerchantProportion());
+//                                    if(adminProportion.getMerchantProportion().compareTo(new BigDecimal("0.00"))!=0){
+//                                        equipmentProportion.setMerchantId(admin.getMerchantId());
+//                                        TAdmin byId = adminService.getById(admin.getMerchantId());
+//                                        equipmentProportion.setMerchantName(byId.getUsername());
+//                                    }
+                                            equipmentProportion.setMerchantId(admin.getMerchantId());
+                                            TAdmin byId2 = adminService.getById(admin.getMerchantId());
+                                            equipmentProportion.setMerchantName(byId2.getUsername());
+                                            equipmentProportion.setPersonageProportion(new BigDecimal("0.00"));
+                                            equipmentProportion.setType(2);
+                                            break;
+                                    }
+                                    boolean save = tProportionService.save(equipmentProportion);
+                                }
+
+                            }
+
+                        }else {
+
+                        }
+                    }
+
+                }
+
+            }
+        }
+        return R.ok();
+    }
 }
 

src/main/java/com/szwl/mapper/TLogoMapper.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 用户定制logo Mapper 接口
+ *  Mapper 接口
  * </p>
  *
  * @author wuhs
- * @since 2022-09-26
+ * @since 2022-11-24
  */
 public interface TLogoMapper extends BaseMapper<TLogo> {
 

src/main/java/com/szwl/mapper/TNoticeMapper.java

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.szwl.model.entity.TNotice;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-11-23
+ */
+public interface TNoticeMapper extends BaseMapper<TNotice> {
+
+}

src/main/java/com/szwl/mapper/xml/TNoticeMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.szwl.mapper.TNoticeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TNotice">
+        <id column="id" property="id" />
+        <result column="create_date" property="createDate" />
+        <result column="modify_date" property="modifyDate" />
+        <result column="title" property="title" />
+        <result column="note" property="note" />
+        <result column="status" property="status" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, create_date, modify_date, title, note, status
+    </sql>
+
+</mapper>

src/main/java/com/szwl/mapper/xml/TPromoCodeMapper.xml

@@ -16,11 +16,12 @@
         <result column="last_use_date" property="lastUseDate" />
         <result column="discount" property="discount" />
         <result column="type" property="type" />
+        <result column="wx_id" property="wxId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, admin_id, create_date, user_name, modify_date, code, is_use, use_date, use_by, last_use_date, discount, type
+        id, admin_id, create_date, user_name, modify_date, code, is_use, use_date, use_by, last_use_date, discount, type,wx_id
     </sql>
 
 </mapper>

src/main/java/com/szwl/model/bean/AreaDTO.java

@@ -0,0 +1,27 @@
+package com.szwl.model.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Accessors(chain = true)
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+public class AreaDTO {
+    @ApiModelProperty(value="value")
+    private Long value;
+    @ApiModelProperty(value="名称")
+    private String text;
+    @ApiModelProperty(value="是否有下级")
+    private Boolean hasChildren;
+    @ApiModelProperty(value="机器列表")
+    private List<AreaDTO> children;
+
+}

src/main/java/com/szwl/model/bean/TEquipmentDTO.java

@@ -25,6 +25,122 @@ public class TEquipmentDTO extends TEquipment {
     @ApiModelProperty(value="当天是否存在告警")
     private boolean hasTodayAlarm= false;
 
+    /**
+     *白糖
+     */
+    @ApiModelProperty(value = "白糖;")
+    private String whiteSugar;
+
+    /**
+     *红糖
+     */
+    @ApiModelProperty(value = "红糖;")
+    private String redSugar;
+
+    /**
+     黄糖
+     blueSugar：蓝糖
+     stick：棍
+     water：水
+     wasteWater：废水
+     */
+    @ApiModelProperty(value = "黄糖;")
+    private String yellowSugar;
+
+    /**
+     * 蓝糖
+     */
+    @ApiModelProperty(value = "蓝糖;")
+    private String blueSugar;
+
+    /**
+     * 棍
+     */
+    @ApiModelProperty(value = "棍;")
+    private String stick;
+
+    /**
+     * 水
+     */
+    @ApiModelProperty(value = "水;")
+    private String water;
+
+    /**
+     * 废水
+     */
+    @ApiModelProperty(value = "废水;")
+    private String wasteWater;
+
+    /**
+     * 是否启用物料监控功能，0：不启用，1：启用
+     */
+    @ApiModelProperty(value = "是否启用物料监控功能;")
+    private String isMaterialUse;
+
+    public String getWhiteSugar() {
+        return whiteSugar;
+    }
+
+    public void setWhiteSugar(String whiteSugar) {
+        this.whiteSugar = whiteSugar;
+    }
+
+    public String getRedSugar() {
+        return redSugar;
+    }
+
+    public void setRedSugar(String redSugar) {
+        this.redSugar = redSugar;
+    }
+
+    public String getYellowSugar() {
+        return yellowSugar;
+    }
+
+    public void setYellowSugar(String yellowSugar) {
+        this.yellowSugar = yellowSugar;
+    }
+
+    public String getBlueSugar() {
+        return blueSugar;
+    }
+
+    public void setBlueSugar(String blueSugar) {
+        this.blueSugar = blueSugar;
+    }
+
+    public String getStick() {
+        return stick;
+    }
+
+    public void setStick(String stick) {
+        this.stick = stick;
+    }
+
+    public String getWater() {
+        return water;
+    }
+
+    public void setWater(String water) {
+        this.water = water;
+    }
+
+    public String getWasteWater() {
+        return wasteWater;
+    }
+
+    public void setWasteWater(String wasteWater) {
+        this.wasteWater = wasteWater;
+    }
+
+    public String getIsMaterialUse() {
+        return isMaterialUse;
+    }
+
+    public void setIsMaterialUse(String isMaterialUse) {
+        this.isMaterialUse = isMaterialUse;
+    }
+
     public List<TAlarmRecord> getAlarmList() {
         return alarmList;
     }

src/main/java/com/szwl/model/bo/JoinpayConstant.java

@@ -55,7 +55,7 @@ public class JoinpayConstant {
     /**
      *  退款成功回调
      */
-    public final static String Notify_Refund_Url = "http://pay.sunzee.com.cn:49013/tOrder/notifyRefund.htm";
+    public final static String Notify_Refund_Url = "http://sz.sunzee.com.cn/ORDER-SERVER/tOrder/notifyRefund.htm";
     public final static String Admin_Notify_Refund_Url = "http://app.sunzee.com.cn/api/order/adminNotifyRefund.htm";
 
 

src/main/java/com/szwl/model/entity/TAdmin.java

@@ -40,7 +40,7 @@ public class TAdmin implements Serializable {
     @ApiModelProperty(value = "邮箱;")
     private String email;
 
-    @ApiModelProperty(value = "设置是否普通管理员（1：管理员，0：子账户）;")
+    @ApiModelProperty(value = "设置是否普通管理员（1：管理员，0：子账户）;1代表TRUE,0代表FALSE")
     private Boolean isAdmined;
 
     @ApiModelProperty(value = "是否启用;")
@@ -65,7 +65,7 @@ public class TAdmin implements Serializable {
 
     private String name;
 
-    @ApiModelProperty(value = "如果is_admined=1,说明这个账户是子账户，它的拥有者的adminId就是parent_id;")
+    @ApiModelProperty(value = "如果is_admined=0,说明这个账户是子账户，它的拥有者的adminId就是parent_id;")
     private Long parentId;
 
     private String password;

src/main/java/com/szwl/model/entity/TLogo.java

@@ -11,15 +11,15 @@ import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 用户定制logo
+ * 
  * </p>
  *
  * @author wuhs
- * @since 2022-09-26
+ * @since 2022-11-24
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="TLogo对象", description="用户定制logo")
+@ApiModel(value="TLogo对象", description="")
 public class TLogo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -31,19 +31,14 @@ public class TLogo implements Serializable {
 
     private Date modifyDate;
 
-    @ApiModelProperty(value = "用户id;")
     private Long adminId;
 
-    @ApiModelProperty(value = "图片地址;")
     private String imgUrl;
 
-    @ApiModelProperty(value = "公司地址;")
     private String adress;
 
-    @ApiModelProperty(value = "电话;")
     private String phone;
 
-    @ApiModelProperty(value = "网页抬头标题;")
     private String title;
 
     private String enTitle;

src/main/java/com/szwl/model/entity/TNotice.java

@@ -0,0 +1,41 @@
+package com.szwl.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-11-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TNotice对象", description="")
+public class TNotice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Date createDate;
+
+    private Date modifyDate;
+
+    private String title;
+
+    private String note;
+
+    private String status;
+
+
+}

src/main/java/com/szwl/model/entity/TOrder.java

@@ -117,4 +117,7 @@ public class TOrder implements Serializable {
     private String proportionDesc;
 
 
+    private BigDecimal marketingAmount;
+
+    private String coupons;
 }

src/main/java/com/szwl/model/entity/TPromoCode.java

@@ -39,7 +39,7 @@ public class TPromoCode implements Serializable {
     @ApiModelProperty(value = "优惠码编号;")
     private Long code;
 
-    @ApiModelProperty(value = "是否使用;")
+    @ApiModelProperty(value = "是否使用;0:未使用，1：已使用，2：已过期")
     private String isUse;
 
     @ApiModelProperty(value = "使用时间;")
@@ -54,8 +54,9 @@ public class TPromoCode implements Serializable {
     @ApiModelProperty(value = "优惠码折扣;")
     private Float discount;
 
-    @ApiModelProperty(value = "类型，0或null:折扣优惠码；1：抵扣价优惠码")
+    @ApiModelProperty(value = "类型，0或null:折扣优惠码；1：抵扣价优惠码；2:5元折扣优惠码")
     private String type;
-
+    @ApiModelProperty(value = "微信id;")
+    private Long wxId;
 
 }

src/main/java/com/szwl/service/TLogoService.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 用户定制logo 服务类
+ *  服务类
  * </p>
  *
  * @author wuhs
- * @since 2022-09-26
+ * @since 2022-11-24
  */
 public interface TLogoService extends IService<TLogo> {
 

src/main/java/com/szwl/service/TNoticeService.java

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.szwl.model.entity.TNotice;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-11-23
+ */
+public interface TNoticeService extends IService<TNotice> {
+
+}

src/main/java/com/szwl/service/TOrderService.java

@@ -24,5 +24,5 @@ public interface TOrderService extends MyIService<TOrder> {
 
     Object initRefundSn(Long equipmentId);
 
-    String refund(String sn, Object o, BigDecimal price, String s, String notifyUrl, String s1);
+    String refund(String sn, Object o, BigDecimal price,BigDecimal p8_MarketRefAmount,String s, String notifyUrl, String s1);
 }

src/main/java/com/szwl/service/impl/TLogoServiceImpl.java

@@ -8,11 +8,11 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 用户定制logo 服务实现类
+ *  服务实现类
  * </p>
  *
  * @author wuhs
- * @since 2022-09-26
+ * @since 2022-11-24
  */
 @Service
 public class TLogoServiceImpl extends ServiceImpl<TLogoMapper, TLogo> implements TLogoService {

src/main/java/com/szwl/service/impl/TNoticeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.szwl.mapper.TNoticeMapper;
+import com.szwl.model.entity.TNotice;
+import com.szwl.service.TNoticeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-11-23
+ */
+@Service
+public class TNoticeServiceImpl extends ServiceImpl<TNoticeMapper, TNotice> implements TNoticeService {
+
+}

src/main/java/com/szwl/service/impl/TOrderServiceImpl.java

@@ -1,5 +1,6 @@
 package com.szwl.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.szwl.model.bo.JoinpayConstant;
 import com.szwl.model.entity.TOrder;
 import com.szwl.mapper.TOrderMapper;
@@ -84,7 +85,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         return "r" + number.toString();
     }
     @Override
-    public String refund(String sn , Object refundSn  , BigDecimal refundAmount , String refundReason , String notifyUrl , String altRefInfo ) {
+    public String refund(String sn , Object refundSn  , BigDecimal refundAmount , BigDecimal p8_MarketRefAmount , String refundReason , String notifyUrl , String altRefInfo ) {
         String url = "https://www.joinpay.com/trade/refund.action";
 
         List<BasicNameValuePair> data = new ArrayList<BasicNameValuePair>();
@@ -96,10 +97,10 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         data.add(new BasicNameValuePair("p5_RefundReason", refundReason));
         data.add(new BasicNameValuePair("p6_NotifyUrl", notifyUrl));
         data.add(new BasicNameValuePair("p7_AltRefInfo", altRefInfo==null?null:altRefInfo.toString()));
-
+        if(p8_MarketRefAmount!=null){
+            data.add(new BasicNameValuePair("p8_MarketRefAmount", p8_MarketRefAmount.toString()));
+        }
         // TODO: 2019-04-01  空值不参与签名!!!!!!!!!!!!!!!!!!
-
-
         String hmac = null;
         try {
             hmac = createHmacSign(data, JoinpayConstant.key);
@@ -111,8 +112,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 
         String result = HttpClientUtils.postKeyValue(url, data);
 
-
-        return Constant.correct_code;
+        JSONObject resultJson = JSONObject.parseObject(result);
+        return resultJson.getString("rc_CodeMsg");
     }
     /**
      * 签名算法sign , hmac 签名

src/main/resources/bootstrap.yml

@@ -66,7 +66,7 @@ spring:
   profiles: prod
   #数据库配置
   datasource:
-    url: jdbc:mysql://rm-wz995mu26a1479kz0so.mysql.rds.aliyuncs.com:3306/szwl
+    url: jdbc:mysql://rm-wz995mu26a1479kz0.mysql.rds.aliyuncs.com:3306/szwl
     username: root
     password: sunzee@020
     driver-class-name: com.mysql.jdbc.Driver

src/test/java/com/szwl/AutoGeneratorTests.java

@@ -47,7 +47,7 @@ class AutoGeneratorTests {
 		strategyConfig
 //				.setCapitalMode(true)//设置全局大写命名
 				.setInclude(new String[]{
-						"t_logo"
+						""
 				})//只会生成该表
 				.setEntityLombokModel(true)//实体类生成之后自动添加lombok注解
 				.setNaming(NamingStrategy.underline_to_camel)//数据库表映射到实体的命名策略