Merge remote-tracking branch 'origin/developer' into developerD

src/main/java/com/caimei/modules/order/service/SplitAccountService.java

@@ -79,6 +79,7 @@ public class SplitAccountService extends BaseService {
                 HashMap<String, BigDecimal> sbm = new HashMap<>();
                 for (SplitAccountPo splitAccountPo : splitBillDetail) {
                     String subUserNo = splitAccountPo.getSubUserNo();
+                    // 计算当前商户号总分账金额
                     if (sbm.containsKey(subUserNo)) {
                         BigDecimal v = MathUtil.add(sbm.get(subUserNo), splitAccountPo.getSplitAccount());
                         sbm.put(subUserNo, v);
@@ -89,6 +90,7 @@ public class SplitAccountService extends BaseService {
                     if (subUserNo.equals(shopOrder.getSplitCode())) {
                         splitAccountPo.setMbOrderId(orderRelation.getMbOrderId());
                         splitAccountPo.setOrderRequestNo(orderRelation.getOrderRequestNo());
+                        // 供应商自己收款，此部分金额留在自己商户号，作为成本分账
                         splitAccountPo.setPayStatus(1);
                         // 保存分账详情
                         newOrderDao.insertSplitAccount(splitAccountPo);
@@ -96,7 +98,11 @@ public class SplitAccountService extends BaseService {
                 }
                 ArrayList<AccountPayOrder.AccountPayOrderExt.SplitBillRule> splitBillRules = new ArrayList<>();
                 sbm.forEach((key, value) -> {
-                    // 不是自己的splitcode分走，是自己的不动
+                    /**
+                     *   不是自己的splitcode分走，是自己的不动
+                     *   把成本之外的金额加入splitRule分账参数,延续上面逻辑,供应商自己的成本由自己的商户号收款,
+                     *   自己成本部分不需要加入分账参数,仅需在else中做业务表参数处理
+                     */
                     if (!key.equals(shopOrder.getSplitCode())) {
                         //佣金
                         AccountPayOrder.AccountPayOrderExt.SplitBillRule splitBillRule = new AccountPayOrder.AccountPayOrderExt.SplitBillRule();
@@ -182,6 +188,10 @@ public class SplitAccountService extends BaseService {
                         }
                     }
                 });
+                /**
+                 *  在上述else代码逻辑中已完成成本的业务表参数处理，在分账详情中排除成本,剩余佣金部分在分账结束收到
+                 *  成功返回码时处理（成本不参与分账）
+                 */
                 splitBillDetail.removeIf(s -> s.getSubUserNo().equals(shopOrder.getSplitCode()));
                 if (null != splitBillRules && splitBillRules.size() > 0) {
                     //第三方分账接口
@@ -198,9 +208,9 @@ public class SplitAccountService extends BaseService {
                         accountPayOrder.setP5_customerNumber(shopOrder.getSplitCode());
                         AccountPayOrder.AccountPayOrderExt accountPayOrderExt = new AccountPayOrder.AccountPayOrderExt();
                         //收款账户商编  填写splitBillRules时候不填写MerchantNo，Amount并且即使填写这两个参数不生效！！
-//                    accountPayOrderExt.setInMerchantNo(splitMoneyVo.getName());
+                        //accountPayOrderExt.setInMerchantNo(splitMoneyVo.getName());
+                        //accountPayOrderExt.setAmount(splitMoneyVo.getSplitMoney());
                         accountPayOrderExt.setOrderType(AccountPayOrderType.TRANSFER);
-//                    accountPayOrderExt.setAmount(splitMoneyVo.getSplitMoney());
                         accountPayOrderExt.setServerCallbackUrl(Constant.prodSplit);
                         accountPayOrderExt.setGoodsName("分账");
                         if (null != splitBillRules && splitBillRules.size() > 0) {
@@ -314,10 +324,15 @@ public class SplitAccountService extends BaseService {
                 //成本+税费
                 costPrice = MathUtil.add(costPrice, payableTax).doubleValue();
             }
+            /**
+             * todo
+             * 出于兼容性考虑，且多次支付手续费不同，分账方式为循环每次支付记录，
+             * 当前业务满足子订单支付完成才进行分账，可以循环子订单统计支付金额，
+             * 进行一次性分账，在当前模式下如果用户分多次支付，精度损失问题较为常见。
+             */
             // 判断是否支付过
             Double paidAmount = newOrderDao.getOrderProductPaidAmount(orderProduct.getOrderProductId());
             // 支付过金额大于0
-            //有已付
             if (null != paidAmount && MathUtil.compare(paidAmount, 0) > 0) {
                 //已付>0，成本-已付
                 costPrice = MathUtil.sub(costPrice, paidAmount).doubleValue();

src/main/java/com/caimei/modules/order/web/CmPayShopController.java

@@ -828,8 +828,6 @@ public class CmPayShopController extends BaseController {
             addMessage(redirectAttributes, "此订单已结算完毕！");
             return "redirect:" + Global.getAdminPath() + "/shopOrder/settlement";
         }
-        if (settleSum >= shouldPayShopAmount) {
-        }
         Integer SDJSS = (Integer) redisService.get("SDJSS");
         //验锁
         if (null != SDJSS && SDJSS > 0) {

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -258,34 +258,34 @@ public class AgencyController extends BaseController {
             }
         }
 
-            Integer companyUserID = newCmClub.getUserID();
-            CmUser cmUser = cmUserService.get(companyUserID + "");
-            if (null != cmUser) {
-                cmUser.setClubStatus(ClubStatus.ONLINE.getCode() + "");
-                cmUser.setValidFlag(AppKeys.FLAG_YES);//解除冻结
-                cmUser.setUserPermission(2);
-                //更新所有企业员工状态
-                cmUserService.updateEmployeeStatus(null, ClubStatus.ONLINE.getCode() + "", null, "1", companyUserID);
-                //更新所有审核过的企业员工权限
-                cmUserService.updateEmployeePermission(2, companyUserID);
-                cmUserService.update(cmUser);
-            } else {
-                addMessage(redirectAttributes, "上线失败，用户信息异常");
-                return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
-            }
-            newCmClub.setStatus(ClubStatus.ONLINE.getCode());
-            newCmClubService.update(newCmClub);
-            addMessage(redirectAttributes, "机构上线成功");
-            redirectAttributes.addAttribute("searchName", newCmClub.getSearchName());
-            redirectAttributes.addAttribute("searchUserName", newCmClub.getSearchUserName());
-            redirectAttributes.addAttribute("searchBindMobile", newCmClub.getSearchBindMobile());
-            redirectAttributes.addAttribute("searchEmail", newCmClub.getSearchEmail());
-            redirectAttributes.addAttribute("searchUserOrganizeID", newCmClub.getSearchUserOrganizeID());
-            redirectAttributes.addAttribute("searchStatus", newCmClub.getSearchStatus());
-            redirectAttributes.addAttribute("searchUserIdentity", newCmClub.getSearchUserIdentity());
-            redirectAttributes.addAttribute("searchStartTime", newCmClub.getSearchStartTime());
-            redirectAttributes.addAttribute("searchEndTime", newCmClub.getSearchEndTime());
+        Integer companyUserID = newCmClub.getUserID();
+        CmUser cmUser = cmUserService.get(companyUserID + "");
+        if (null != cmUser) {
+            cmUser.setClubStatus(ClubStatus.ONLINE.getCode() + "");
+            cmUser.setValidFlag(AppKeys.FLAG_YES);//解除冻结
+            cmUser.setUserPermission(2);
+            //更新所有企业员工状态
+            cmUserService.updateEmployeeStatus(null, ClubStatus.ONLINE.getCode() + "", null, "1", companyUserID);
+            //更新所有审核过的企业员工权限
+            cmUserService.updateEmployeePermission(2, companyUserID);
+            cmUserService.update(cmUser);
+        } else {
+            addMessage(redirectAttributes, "上线失败，用户信息异常");
             return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
+        }
+        newCmClub.setStatus(ClubStatus.ONLINE.getCode());
+        newCmClubService.update(newCmClub);
+        addMessage(redirectAttributes, "机构上线成功");
+        redirectAttributes.addAttribute("searchName", newCmClub.getSearchName());
+        redirectAttributes.addAttribute("searchUserName", newCmClub.getSearchUserName());
+        redirectAttributes.addAttribute("searchBindMobile", newCmClub.getSearchBindMobile());
+        redirectAttributes.addAttribute("searchEmail", newCmClub.getSearchEmail());
+        redirectAttributes.addAttribute("searchUserOrganizeID", newCmClub.getSearchUserOrganizeID());
+        redirectAttributes.addAttribute("searchStatus", newCmClub.getSearchStatus());
+        redirectAttributes.addAttribute("searchUserIdentity", newCmClub.getSearchUserIdentity());
+        redirectAttributes.addAttribute("searchStartTime", newCmClub.getSearchStartTime());
+        redirectAttributes.addAttribute("searchEndTime", newCmClub.getSearchEndTime());
+        return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
 
     }
 
@@ -306,7 +306,6 @@ public class AgencyController extends BaseController {
             cmUser.setClubStatus(ClubStatus.FREEZE.getCode() + "");
             cmUser.setValidFlag(AppKeys.FLAG_NO);//冻结
             cmUser.setUserPermission(0);
-
             OperationalLogs sysLog = new OperationalLogs();
             sysLog.setOperationtime(new Date());
             sysLog.setContact(newCmClub.getLinkMan());
@@ -323,28 +322,27 @@ public class AgencyController extends BaseController {
                     int i = sysLogService.insert(sysLog);
                 }
             }
-
-                //更新所有企业员工状态 设置未提示
-                cmUserService.updateEmployeeStatus(1, ClubStatus.ONLINE.getCode() + "", null, "0", companyUserID);
-                cmUserService.update(cmUser);
-            } else {
-                addMessage(redirectAttributes, "下线失败，用户信息异常");
-                return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
-            }
-            newCmClub.setStatus(ClubStatus.FREEZE.getCode());
-            newCmClubService.update(newCmClub);
-            addMessage(redirectAttributes, "机构下线成功");
-            redirectAttributes.addAttribute("searchName", newCmClub.getSearchName());
-            redirectAttributes.addAttribute("searchUserName", newCmClub.getSearchUserName());
-            redirectAttributes.addAttribute("searchBindMobile", newCmClub.getSearchBindMobile());
-            redirectAttributes.addAttribute("searchEmail", newCmClub.getSearchEmail());
-            redirectAttributes.addAttribute("searchUserOrganizeID", newCmClub.getSearchUserOrganizeID());
-            redirectAttributes.addAttribute("searchStatus", newCmClub.getSearchStatus());
-            redirectAttributes.addAttribute("searchUserIdentity", newCmClub.getSearchUserIdentity());
-            redirectAttributes.addAttribute("searchStartTime", newCmClub.getSearchStartTime());
-            redirectAttributes.addAttribute("searchEndTime", newCmClub.getSearchEndTime());
+            //更新所有企业员工状态 设置未提示
+            cmUserService.updateEmployeeStatus(1, ClubStatus.ONLINE.getCode() + "", null, "0", companyUserID);
+            cmUserService.update(cmUser);
+        } else {
+            addMessage(redirectAttributes, "下线失败，用户信息异常");
             return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
         }
+        newCmClub.setStatus(ClubStatus.FREEZE.getCode());
+        newCmClubService.update(newCmClub);
+        addMessage(redirectAttributes, "机构下线成功");
+        redirectAttributes.addAttribute("searchName", newCmClub.getSearchName());
+        redirectAttributes.addAttribute("searchUserName", newCmClub.getSearchUserName());
+        redirectAttributes.addAttribute("searchBindMobile", newCmClub.getSearchBindMobile());
+        redirectAttributes.addAttribute("searchEmail", newCmClub.getSearchEmail());
+        redirectAttributes.addAttribute("searchUserOrganizeID", newCmClub.getSearchUserOrganizeID());
+        redirectAttributes.addAttribute("searchStatus", newCmClub.getSearchStatus());
+        redirectAttributes.addAttribute("searchUserIdentity", newCmClub.getSearchUserIdentity());
+        redirectAttributes.addAttribute("searchStartTime", newCmClub.getSearchStartTime());
+        redirectAttributes.addAttribute("searchEndTime", newCmClub.getSearchEndTime());
+        return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
+    }
 
 
     /**
@@ -412,17 +410,17 @@ public class AgencyController extends BaseController {
     @RequiresPermissions("user:newCmClub:edit")
     public String save(NewCmClub newCmClub, CmClubinfo cmClubinfo, Model model, RedirectAttributes redirectAttributes) {
         ArrayList<String> list = new ArrayList();
-         OperationalLogs sysLog = new OperationalLogs();
+        OperationalLogs sysLog = new OperationalLogs();
         NewCmClub newCmClubs = sysLogService.newCmClub(newCmClub.getClubID());
-        System.out.println("id>>>>>>>>>>"+ newCmClub.getClubID()+"<<<<<"+cmClubinfo.getUserID());
+        System.out.println("id>>>>>>>>>>" + newCmClub.getClubID() + "<<<<<" + cmClubinfo.getUserID());
         CmClubinfo cmClubinfos = sysLogService.cmclubinfo(cmClubinfo.getClubInfoID());
         int type = 0;
-        logger.info("newCmClub页面数据"+newCmClub);
-        logger.info("newCmClub数据库数据"+newCmClubs);
-        logger.info("cmClubinfo页面数据"+cmClubinfo);
-        logger.info("cmClubinfo数据库数据"+cmClubinfos);
-       //编辑时添加操作日志
-        if(newCmClubs!=null) {
+        logger.info("newCmClub页面数据" + newCmClub);
+        logger.info("newCmClub数据库数据" + newCmClubs);
+        logger.info("cmClubinfo页面数据" + cmClubinfo);
+        logger.info("cmClubinfo数据库数据" + cmClubinfos);
+        //编辑时添加操作日志
+        if (newCmClubs != null) {
             if (cmClubinfos != null) {
                 if (StringUtils.isBlank(cmClubinfos.getHighestAchievement()) || null == cmClubinfos.getReachPepole() || null == cmClubinfos.getClinchPepole()) {
                     if (!"".equals(cmClubinfo.getHighestAchievement()) || cmClubinfo.getReachPepole() != null || cmClubinfo.getClinchPepole() != null) {
@@ -1144,7 +1142,7 @@ public class AgencyController extends BaseController {
             if (StringUtils.equals("1", auditStatus)) {
                 // 审核通过机构为新分配机构
                 newCmClub.setNewDeal(1);
-                    sysLog.setActioncontent("审核通过");
+                sysLog.setActioncontent("审核通过");
                 String Contact = sysLogService.auditlinkMan(Integer.parseInt(id));
                 String ionName = sysLogService.auditName(Integer.parseInt(id));
                 sysLog.setContact(Contact);
@@ -1163,7 +1161,7 @@ public class AgencyController extends BaseController {
                 }
                 Date date = new Date();
                 String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
-                MessageCenter messageCenter=new MessageCenter();
+                MessageCenter messageCenter = new MessageCenter();
                 messageCenter.setShopId(null);
                 messageCenter.setClubId(newCmClub.getClubID());
                 messageCenter.setUserType(1);
@@ -1190,7 +1188,7 @@ public class AgencyController extends BaseController {
 
                     String pagePath = "https://www.caimei365.com/";
                     for (String openid : openidList) {
-                        weChatService.sendTemplateMsg(accessToken, openid,auditTime, pagePath);
+                        weChatService.sendTemplateMsg(accessToken, openid, auditTime, pagePath);
                     }
                 } catch (Exception e) {
                     logger.error("【资质机构审核成功通知】获取微信公众号access_token异常！", e);
@@ -1204,7 +1202,7 @@ public class AgencyController extends BaseController {
             } else {
                 Date date = new Date();
                 String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
-                MessageCenter messageCenter=new MessageCenter();
+                MessageCenter messageCenter = new MessageCenter();
                 messageCenter.setShopId(null);
                 messageCenter.setClubId(newCmClub.getClubID());
                 messageCenter.setUserType(1);
@@ -1221,10 +1219,10 @@ public class AgencyController extends BaseController {
                     logger.info("userid>>>>>>>>>>>>>>>" + userID + "unionid》》》》》》》》》》" + unionid + "openid》》》》》》》》》" + openidList);
                     String accessToken = weChatService.getAccessToken();
                     String auditTime = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
-                    String auditResult=auditNote;
+                    String auditResult = auditNote;
                     String pagePath = "https://www.caimei365.com/";
                     for (String openid : openidList) {
-                        weChatService.sendTemplateMessg(accessToken, openid,auditResult,auditTime, pagePath);
+                        weChatService.sendTemplateMessg(accessToken, openid, auditResult, auditTime, pagePath);
                     }
                 } catch (Exception e) {
                     logger.error("【资质机构审核失败通知】获取微信公众号access_token异常！", e);
@@ -1293,7 +1291,7 @@ public class AgencyController extends BaseController {
             sendMessage("1", companyUser.getUserID(), title, messageContent);
             /**发送短信*/
             if (StringUtils.isNotEmpty(mobile)) {
-                SMSUtils.sendSms(0,mobile, smsMessage);
+                SMSUtils.sendSms(0, mobile, smsMessage);
             }
             map.put("success", true);
             map.put("msg", "操作成功");
@@ -1363,9 +1361,9 @@ public class AgencyController extends BaseController {
     public Map<String, Object> upgradeClub(NewCmClub cmClub, String type, RedirectAttributes redirectAttributes) {
         OperationalLogs sysLog = new OperationalLogs();
         sysLog.setOperationtime(new Date());
-        if ("1".equals(type)){
+        if ("1".equals(type)) {
             sysLog.setActioncontent("设置为资质机构");
-        }else {
+        } else {
             sysLog.setActioncontent("设置为个人机构");
         }
         sysLog.setContact(cmClub.getLinkMan());
@@ -1383,7 +1381,6 @@ public class AgencyController extends BaseController {
         }
 
 
-
         Map<String, Object> map = new HashMap<>();
         if (cmClub != null) {
             CmUser cmUser = cmUserService.get(cmClub.getUserID().toString());
@@ -1474,9 +1471,6 @@ public class AgencyController extends BaseController {
     }
 
 
-
-
-
     @RequestMapping("cmRegistReportList")
     public String cmRegistReportList(CmClubRemarks cmClubRemarks, HttpServletRequest request, HttpServletResponse response, Model model) {
         List<VisitRemarkVo> remarksLists = newCmClubDao.findRegistLists(cmClubRemarks);
@@ -1490,19 +1484,19 @@ public class AgencyController extends BaseController {
     }
 
     @RequestMapping("recordLinkage")
-    public String RecordLinkage(Integer clubId,HttpServletRequest request, HttpServletResponse response, Model model) {
-       String link= newCmClubDao.recordLinkage(clubId);
-        String describe= newCmClubDao.recordDescribe(clubId);
+    public String RecordLinkage(Integer clubId, HttpServletRequest request, HttpServletResponse response, Model model) {
+        String link = newCmClubDao.recordLinkage(clubId);
+        String describe = newCmClubDao.recordDescribe(clubId);
         if (describe == null) {
             describe = "";
         }
-       String linkage="";
-        if(domain.contains("-b")){
-            linkage="http://zzjtest.gz.aeert.com/clubinfo.html?clubId="+clubId;
-        }else if(domain.contains("www")){
-            linkage="https://www.caimei365.com/clubinfo.html?clubId="+clubId;
-        }else {
-            linkage="http://localhost:8081/clubinfo.html?clubId="+clubId;
+        String linkage = "";
+        if (domain.contains("-b")) {
+            linkage = "http://zzjtest.gz.aeert.com/clubinfo.html?clubId=" + clubId;
+        } else if (domain.contains("www")) {
+            linkage = "https://www.caimei365.com/clubinfo.html?clubId=" + clubId;
+        } else {
+            linkage = "http://localhost:8081/clubinfo.html?clubId=" + clubId;
         }
         // 机构注册IP，注册ip所在地
         List<CmBehaviorRecord> behaviorList = newCmClubDao.selRegisterIP(clubId);
@@ -1513,7 +1507,7 @@ public class AgencyController extends BaseController {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         // 获取注册时间一周前时间
         Calendar calendar = Calendar.getInstance();
-        for (CmBehaviorRecord behaviorRecord: behaviorList) {
+        for (CmBehaviorRecord behaviorRecord : behaviorList) {
             try {
                 Date date = simpleDateFormat.parse(behaviorRecord.getRegisterTime());
                 String registerTime = simpleDateFormat.format(date);
@@ -1538,39 +1532,39 @@ public class AgencyController extends BaseController {
         Page<CmBehaviorRecord> page = cmBehaviorRecordService.behaviorAgencyPage(new Page<>(request, response), record);
         String masBehavior = "";
         List<CmBehaviorRecord> list = page.getList();
-        for (int i = 0; i <= list.size()-1; i++) {
+        for (int i = 0; i <= list.size() - 1; i++) {
             masBehavior += list.get(i).getPageLabel();
-            if (list.size()-1 != i) {
+            if (list.size() - 1 != i) {
                 masBehavior += ",";
             }
         }
-        model.addAttribute("page",page);
-        model.addAttribute("link",link);
-        model.addAttribute("linkage",linkage);
-        model.addAttribute("describe",describe);
-        model.addAttribute("masBehavior",masBehavior);
-        model.addAttribute("ipAddress",ipAddress);
+        model.addAttribute("page", page);
+        model.addAttribute("link", link);
+        model.addAttribute("linkage", linkage);
+        model.addAttribute("describe", describe);
+        model.addAttribute("masBehavior", masBehavior);
+        model.addAttribute("ipAddress", ipAddress);
         model.addAttribute("clubId", clubId);
         return "modules/userNew/recordLinkageForm";
     }
 
     @RequestMapping("recordLinkageSave")
-    public String RecordLinkageSave(String describe,String masBehavior,String link,Integer clubId,HttpServletRequest request, HttpServletResponse response, Model model,RedirectAttributes redirectAttributes) {
+    public String RecordLinkageSave(String describe, String masBehavior, String link, Integer clubId, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes redirectAttributes) {
         model.addAttribute("clubId", clubId);
 
-        if(domain.contains("-b")){
-            link="http://zzjtest.gz.aeert.com/clubinfo.html?clubId="+clubId;
-        }else if(domain.contains("www")){
-            link="https://www.caimei365.com/clubinfo.html?clubId="+clubId;
-        }else {
-            link="http://localhost:8081/clubinfo.html?clubId="+clubId;
+        if (domain.contains("-b")) {
+            link = "http://zzjtest.gz.aeert.com/clubinfo.html?clubId=" + clubId;
+        } else if (domain.contains("www")) {
+            link = "https://www.caimei365.com/clubinfo.html?clubId=" + clubId;
+        } else {
+            link = "http://localhost:8081/clubinfo.html?clubId=" + clubId;
         }
 //        StringSelection stsel = new StringSelection(link);
         String replace = describe;
         if (describe.contains(masBehavior)) {
             replace = describe.replace(masBehavior, "");
         }
-        newCmClubDao.addRecordLinkage(replace,link,clubId);
+        newCmClubDao.addRecordLinkage(replace, link, clubId);
         logger.info(">>>>>>>>>>>生成记录链接");
         addMessage(redirectAttributes, "链接已生成并自动复制，可直接粘贴");
 //        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(stsel, stsel);
@@ -1578,8 +1572,6 @@ public class AgencyController extends BaseController {
     }
 
 
-
-
     /**
      * 资料备注列表
      */
@@ -1593,79 +1585,83 @@ public class AgencyController extends BaseController {
     public List<ServiceProviderModel> group(Integer leaderId) {
         return newCmClubService.findGroup(leaderId);
     }
+
     @RequiresPermissions("user:agency:cmrenaksList")
     @RequestMapping("cmrenaksList")
-    public String renaks(CmRemaks cmRemaks,HttpServletRequest request, HttpServletResponse response, Model model) {
-        Page<CmRemaks> page = cmRemaksService.findPage(new Page<CmRemaks>(request, response,20), cmRemaks);
-        model.addAttribute("page",page);
-        model.addAttribute("cmRemaks",cmRemaks);
+    public String renaks(CmRemaks cmRemaks, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<CmRemaks> page = cmRemaksService.findPage(new Page<CmRemaks>(request, response, 20), cmRemaks);
+        model.addAttribute("page", page);
+        model.addAttribute("cmRemaks", cmRemaks);
         return "modules/userNew/cmRemaksList";
     }
 
     @RequestMapping("cmrenaksForm")
-    public String renaksForm(CmRemaks cmRemaks,HttpServletRequest request, HttpServletResponse response, Model model) {
-        if(cmRemaks.getRemarksId()!=null){
-           String remaks= newCmClubService.upremakasList(cmRemaks);
-            model.addAttribute("list",cmRemaks);
-            model.addAttribute("remaks",remaks);
-            model.addAttribute("remaksId",cmRemaks.getRemarksId());
+    public String renaksForm(CmRemaks cmRemaks, HttpServletRequest request, HttpServletResponse response, Model model) {
+        if (cmRemaks.getRemarksId() != null) {
+            String remaks = newCmClubService.upremakasList(cmRemaks);
+            model.addAttribute("list", cmRemaks);
+            model.addAttribute("remaks", remaks);
+            model.addAttribute("remaksId", cmRemaks.getRemarksId());
         }
         return "modules/userNew/cmRemaksForm";
     }
+
     @RequestMapping("addcmrenaksForm")
-    public String addrenaksForm(CmRemaks cmRemaks,HttpServletRequest request, HttpServletResponse response, Model model) {
-       if(cmRemaks.getRemarksId()!=null){
-           System.out.println("》》》》进入修改方法");
-           newCmClubService.upremarks(cmRemaks);
-       }else {
-           System.out.println("》》》》进入新增方法");
-           cmRemaks.setAddtime(new Date());
-           newCmClubService.addRemarks(cmRemaks);
-       }
+    public String addrenaksForm(CmRemaks cmRemaks, HttpServletRequest request, HttpServletResponse response, Model model) {
+        if (cmRemaks.getRemarksId() != null) {
+            System.out.println("》》》》进入修改方法");
+            newCmClubService.upremarks(cmRemaks);
+        } else {
+            System.out.println("》》》》进入新增方法");
+            cmRemaks.setAddtime(new Date());
+            newCmClubService.addRemarks(cmRemaks);
+        }
         return "redirect:" + Global.getAdminPath() + "/new/user/agency/cmrenaksList";
     }
+
     @RequestMapping("deleteRamarks")
-    public String deleteRamarks(CmRemaks cmRemaks,HttpServletRequest request, HttpServletResponse response, Model model) {
-         newCmClubService.deleteRamarks(cmRemaks);
+    public String deleteRamarks(CmRemaks cmRemaks, HttpServletRequest request, HttpServletResponse response, Model model) {
+        newCmClubService.deleteRamarks(cmRemaks);
         return "redirect:" + Global.getAdminPath() + "/new/user/agency/cmrenaksList";
     }
 
     @RequiresPermissions("user:agency:reportList")
     @RequestMapping("ReportList")
-    public String ReportList(CmReport cmReport,HttpServletRequest request, HttpServletResponse response, Model model) {
+    public String ReportList(CmReport cmReport, HttpServletRequest request, HttpServletResponse response, Model model) {
 
-        Page<CmReport> page = newCmClubService.ReportList(new Page<CmReport>(request, response,20), cmReport);
-        model.addAttribute("page",page);
+        Page<CmReport> page = newCmClubService.ReportList(new Page<CmReport>(request, response, 20), cmReport);
+        model.addAttribute("page", page);
         model.addAttribute("cmReport", cmReport);
         return "modules/userNew/ReportList";
     }
+
     @ResponseBody
     @RequestMapping("ReportCount")
-    public Map<String, Object> ReportCount(Integer reportId,String auditName,String auditText,Integer status,Model model) {
+    public Map<String, Object> ReportCount(Integer reportId, String auditName, String auditText, Integer status, Model model) {
         Map<String, Object> map = new HashedMap();
-       Integer clubCount= newCmClubDao.clubRemarksConut(reportId);
-        Integer visitorCount=newCmClubDao.visitorRemarksConut(reportId);
+        Integer clubCount = newCmClubDao.clubRemarksConut(reportId);
+        Integer visitorCount = newCmClubDao.visitorRemarksConut(reportId);
         SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
-        auditName=principal.getName();
-         if((clubCount+=visitorCount)>0){
-             map.put("success", false);
-             newCmClubDao.updateAuditRemarks(reportId,auditName,auditText,status);
-             System.out.println(">>>>>>>>"+(clubCount+=visitorCount));
-         }else {
-             System.out.println(">>>>>>>>"+(clubCount+=visitorCount));
-             map.put("success", true);
-         }
+        auditName = principal.getName();
+        if ((clubCount += visitorCount) > 0) {
+            map.put("success", false);
+            newCmClubDao.updateAuditRemarks(reportId, auditName, auditText, status);
+            System.out.println(">>>>>>>>" + (clubCount += visitorCount));
+        } else {
+            System.out.println(">>>>>>>>" + (clubCount += visitorCount));
+            map.put("success", true);
+        }
         return map;
     }
 
     @ResponseBody
     @RequestMapping("ClubRemarks")
-    public Map<String, Object> audit(Integer remarksId,Integer type,Model model) {
+    public Map<String, Object> audit(Integer remarksId, Integer type, Model model) {
         Map<String, Object> map = new HashedMap();
-        if(type==1){
+        if (type == 1) {
             newCmClubDao.updateClubRemarks(remarksId);
             map.put("success", true);
-        }else {
+        } else {
             newCmClubDao.updateVisitorRemarks(remarksId);
             map.put("success", true);
         }
@@ -1674,16 +1670,16 @@ public class AgencyController extends BaseController {
 
     @ResponseBody
     @RequestMapping("DeleteRepor")
-    public Map<String, Object> DeleteRepor(Integer reportId,Model model) {
+    public Map<String, Object> DeleteRepor(Integer reportId, Model model) {
         Map<String, Object> map = new HashedMap();
-        Integer clubCount= newCmClubDao.clubRemarksConut(reportId);
-        Integer visitorCount=newCmClubDao.visitorRemarksConut(reportId);
-        if((clubCount+=visitorCount)>0){
+        Integer clubCount = newCmClubDao.clubRemarksConut(reportId);
+        Integer visitorCount = newCmClubDao.visitorRemarksConut(reportId);
+        if ((clubCount += visitorCount) > 0) {
             map.put("success", false);
-            System.out.println(">>>>>>>>"+(clubCount+=visitorCount));
-        }else {
+            System.out.println(">>>>>>>>" + (clubCount += visitorCount));
+        } else {
             newCmClubDao.deleteClubRemarks(reportId);
-            System.out.println(">>>>>>>>"+(clubCount+=visitorCount));
+            System.out.println(">>>>>>>>" + (clubCount += visitorCount));
             map.put("success", true);
         }
         return map;
@@ -1692,8 +1688,8 @@ public class AgencyController extends BaseController {
     @RequestMapping(value = "/statisticsList")
     public String statisticsList(ClubStatistics statistics, HttpServletRequest request, HttpServletResponse response, Model model) {
         Page<ClubStatistics> page = newCmClubService.statisticsList(new Page<>(request, response), statistics);
-        model.addAttribute("statistics",statistics);
-        model.addAttribute("page",page);
+        model.addAttribute("statistics", statistics);
+        model.addAttribute("page", page);
         return "modules/userNew/cmAgencyStatisticsList";
     }
 
@@ -1714,7 +1710,7 @@ public class AgencyController extends BaseController {
             EasyExcel.write(response.getOutputStream(), easyExcel.class).autoCloseStream(Boolean.FALSE).sheet("模板")
                     .doWrite(statisticsList);
         } catch (Exception e) {
-            addMessage(redirectAttributes,"机构分析统计导出失败",e.getMessage());
+            addMessage(redirectAttributes, "机构分析统计导出失败", e.getMessage());
             e.printStackTrace();
         }
     }
@@ -1723,15 +1719,15 @@ public class AgencyController extends BaseController {
     public String clubPortrait(CmPortrait cmPortrait, Model model) {
         CmPortrait portrait = portraitService.dataTotal(cmPortrait);
         ClubStatistics statistics = portraitService.clubData(cmPortrait.getClubID());
-        model.addAttribute("cmPortrait",cmPortrait);
-        model.addAttribute("portrait",portrait);
-        model.addAttribute("statistics",statistics);
+        model.addAttribute("cmPortrait", cmPortrait);
+        model.addAttribute("portrait", portrait);
+        model.addAttribute("statistics", statistics);
         return "modules/userNew/cmClubPortrait";
     }
 
     @RequestMapping("/selPortraitData")
     @ResponseBody
-    public Map<String,Object> selPortraitData(CmPortrait cmPortrait) {
+    public Map<String, Object> selPortraitData(CmPortrait cmPortrait) {
         Map<String, Object> map = Maps.newLinkedHashMap();
         try {
             CmPortrait portrait = portraitService.dataList(cmPortrait);
@@ -1749,46 +1745,46 @@ public class AgencyController extends BaseController {
             order.setStartTime(portrait.getStartTime());
             order.setEndTime(portrait.getEndTime());
             if (order.getOrderTotalNum() == 0) {
-                map.put("order",null);
+                map.put("order", null);
             } else {
-                map.put("order",order);
+                map.put("order", order);
             }
             behavior.setName(portrait.getBehaviorType());
             behavior.setValue(portrait.getBehaviorValue());
             behavior.setStartTime(portrait.getStartTime());
             behavior.setEndTime(portrait.getEndTime());
             if (ObjectUtils.isEmpty(behavior.getValue())) {
-                map.put("behavior",null);
+                map.put("behavior", null);
             } else {
-                map.put("behavior",behavior);
+                map.put("behavior", behavior);
             }
             remarks.setName(portrait.getRemarksType());
             remarks.setValue(portrait.getRemarksValue());
             remarks.setStartTime(portrait.getStartTime());
             remarks.setEndTime(portrait.getEndTime());
             if (ObjectUtils.isEmpty(remarks.getValue())) {
-                map.put("remarks",null);
+                map.put("remarks", null);
             } else {
-                map.put("remarks",remarks);
+                map.put("remarks", remarks);
             }
             pageType.setName(portrait.getPageType());
             pageType.setValue(portrait.getPageTypeValue());
             pageType.setStartTime(portrait.getStartTime());
             pageType.setEndTime(portrait.getEndTime());
             if (ObjectUtils.isEmpty(pageType.getValue())) {
-                map.put("pageType",null);
+                map.put("pageType", null);
             } else {
-                map.put("pageType",pageType);
+                map.put("pageType", pageType);
             }
-            map.put("portrait",portrait);
+            map.put("portrait", portrait);
             /*map.put("behavior",behavior);
             map.put("remarks",remarks);
             map.put("pageType",pageType);
             map.put("order",order);*/
-            map.put("code",0);
+            map.put("code", 0);
         } catch (Exception e) {
             e.printStackTrace();
-            map.put("code",-1);
+            map.put("code", -1);
         }
         return map;
     }
@@ -1825,9 +1821,9 @@ public class AgencyController extends BaseController {
         cmClubinfo.setFirstClubType(newCmClub.getFirstClubType());
         cmClubinfo.setSecondClubType(newCmClub.getSecondClubType());
         cmClubinfo.setDepartment(newCmClub.getDepartment());
-        String  mainpro = newCmClub.getMainpro();
+        String mainpro = newCmClub.getMainpro();
         if (StringUtils.isNotEmpty(mainpro)) {
-            mainpro = mainpro.replaceAll("/",",");
+            mainpro = mainpro.replaceAll("/", ",");
         }
         cmClubinfo.setMainpro(mainpro);
         cmClubinfo.setMedicalPracticeLicenseImg(newCmClub.getMedicalPracticeLicenseImg());

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -1402,7 +1402,7 @@
         SELECT IFNULL(SUM(settleAmount), 0)
         FROM cm_settle_record
         WHERE settleType = 1
-          AND shopOrderId = 24665
+          AND shopOrderId = #{shopOrderId}
     </select>
     <select id="findSettleRecord" resultType="com.caimei.modules.order.entity.SettleRecord">
         select distinct csr.settleAmount,