优化代码

service-acct/src/main/java/com/java110/acct/payment/adapt/easypay/EasyPaymentFactoryAdapt.java

@@ -68,11 +68,6 @@ public class EasyPaymentFactoryAdapt implements IPaymentFactoryAdapt {
     public static final String TRADE_TYPE_MWEB = "MWEB";
     public static final String TRADE_TYPE_APP = "APP";
 
-    private static String VERSION = "1.0";
-
-    private static String SIGN_TYPE = "RSA2";// 加密算法：SM4、RSA2
-
-    private static String gzhPayUrl = "https://mbank.bankofbbg.com/www/corepaycer/WxGzhPay";
 
     @Autowired
     private ISmallWechatV1InnerServiceSMO smallWechatV1InnerServiceSMOImpl;

service-acct/src/main/java/com/java110/acct/payment/adapt/easypay/QrCodeEasyPaymentAdapt.java

@@ -45,13 +45,6 @@ public class QrCodeEasyPaymentAdapt implements IQrCodePaymentSMO {
 
     private static final String WECHAT_SERVICE_MCH_ID = "SERVICE_MCH_ID";
 
-    private static String VERSION = "1.0";
-
-    private static String SIGN_TYPE = "RSA2";// 加密算法：SM4、RSA2
-
-    private static String gzhPayUrl = "https://mbank.bankofbbg.com/www/corepaycer/ScanCodePay";
-
-    private static String queryUrl = "https://mbank.bankofbbg.com/www/corepaycer/QueryTxnInfo";// 交易查询地址
 
     @Autowired
     private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl;

service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairStartCmd.java

@@ -2,16 +2,19 @@ package com.java110.community.cmd.ownerRepair;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.repair.RepairDto;
 import com.java110.dto.repair.RepairUserDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.community.IRepairInnerServiceSMO;
 import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
 import com.java110.intf.community.IRepairUserInnerServiceSMO;
 import com.java110.intf.community.IRepairUserV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.owner.RepairPoolPo;
 import com.java110.po.owner.RepairUserPo;
 import com.java110.utils.constant.BusinessTypeConstant;
@@ -41,6 +44,9 @@ public class RepairStartCmd extends Cmd {
     @Autowired
     private IRepairUserV1InnerServiceSMO repairUserV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "repairId", "未包含报修单信息");
@@ -49,6 +55,14 @@ public class RepairStartCmd extends Cmd {
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        String userId = CmdContextUtils.getUserId(context);
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos,"用户未登录");
+
         RepairDto repairDto = new RepairDto();
         repairDto.setRepairId(reqJson.getString("repairId"));
         //查询报修信息
@@ -79,8 +93,8 @@ public class RepairStartCmd extends Cmd {
                 repairUserPo.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
                 repairUserPo.setState(RepairUserDto.STATE_START);
                 repairUserPo.setContext("启动报修流程");
-                repairUserPo.setStaffId(reqJson.getString("userId"));
-                repairUserPo.setStaffName(reqJson.getString("userName"));
+                repairUserPo.setStaffId(userDtos.get(0).getUserId()); //当前处理员工id
+                repairUserPo.setStaffName(userDtos.get(0).getName()); //当前处理员工名称
                 for (RepairUserDto repairUser : repairUserDtos) {
                     if (repairUser.getEndTime() == null) {
                         repairUserPo.setPreStaffId(repairUser.getStaffId());

service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairStopCmd.java

@@ -2,16 +2,19 @@ package com.java110.community.cmd.ownerRepair;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.repair.RepairDto;
 import com.java110.dto.repair.RepairUserDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.community.IRepairInnerServiceSMO;
 import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
 import com.java110.intf.community.IRepairUserInnerServiceSMO;
 import com.java110.intf.community.IRepairUserV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.owner.RepairPoolPo;
 import com.java110.po.owner.RepairUserPo;
 import com.java110.utils.exception.CmdException;
@@ -40,6 +43,9 @@ public class RepairStopCmd extends Cmd {
     @Autowired
     private IRepairUserV1InnerServiceSMO repairUserV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "repairId", "未包含报修单信息");
@@ -49,6 +55,14 @@ public class RepairStopCmd extends Cmd {
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        String userId = CmdContextUtils.getUserId(context);
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos,"用户未登录");
+
         RepairDto repairDto = new RepairDto();
         repairDto.setRepairId(reqJson.getString("repairId"));
         //查询报修信息
@@ -72,8 +86,8 @@ public class RepairStopCmd extends Cmd {
             repairUserPo.setCreateTime(simpleDateFormat.format(new Date())); //创建时间
             repairUserPo.setState(RepairUserDto.STATE_STOP); //状态(暂停状态)
             repairUserPo.setContext(reqJson.getString("remark")); //报修内容
-            repairUserPo.setStaffId(reqJson.getString("userId")); //当前处理员工id
-            repairUserPo.setStaffName(reqJson.getString("userName")); //当前处理员工名称
+            repairUserPo.setStaffId(userDtos.get(0).getUserId()); //当前处理员工id
+            repairUserPo.setStaffName(userDtos.get(0).getName()); //当前处理员工名称
             RepairUserDto repairUserDto = new RepairUserDto();
             repairUserDto.setRepairId(reqJson.getString("repairId"));
             repairUserDto.setState(RepairUserDto.STATE_DOING); //处理中状态

service-fee/src/main/java/com/java110/fee/dao/impl/FeeConfigServiceDaoImpl.java

@@ -82,8 +82,8 @@ public class FeeConfigServiceDaoImpl extends BaseServiceDao implements IFeeConfi
     @Override
     public List<Map> getFeeConfigInfo(Map info) throws DAOException {
         logger.debug("查询费用配置信息 入参 info : {}", info);
-        List<Map> businessFeeConfigInfos = sqlSessionTemplate.selectList("feeConfigServiceDaoImpl.getFeeConfigInfo", info);
-        return businessFeeConfigInfos;
+        List<Map> infos = sqlSessionTemplate.selectList("feeConfigServiceDaoImpl.getFeeConfigInfo", info);
+        return infos;
     }
 
 

service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryPrePaymentCmd.java

@@ -87,6 +87,9 @@ public class QueryPrePaymentCmd extends Cmd {
                 tmpReportFeeMonthStatisticsDto.setObjName(tmpReportFeeMonthStatisticsDto.getCarNum());
             }
 
+        }
+
+        for (ReportFeeMonthStatisticsDto tmpReportFeeMonthStatisticsDto : reportFeeMonthStatisticsDtos) {
             try {
                 tmpReportFeeMonthStatisticsDto.setOweDay(DateUtil.daysBetween(DateUtil.getDateFromString(tmpReportFeeMonthStatisticsDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A), DateUtil.getCurrentDate()));
             } catch (ParseException e) {

service-report/src/main/java/com/java110/report/dao/impl/ReportFeeMonthStatisticsServiceDaoImpl.java

@@ -511,9 +511,9 @@ public class ReportFeeMonthStatisticsServiceDaoImpl extends BaseServiceDao imple
     public List<Map> queryDeadlineFee(Map info) throws DAOException {
         logger.debug("查询费用月统计信息 入参 info : {}", info);
 
-        List<Map> businessReportFeeMonthStatisticsInfos = sqlSessionTemplate.selectList("reportFeeMonthStatisticsServiceDaoImpl.queryDeadlineFee", info);
+        List<Map> infos = sqlSessionTemplate.selectList("reportFeeMonthStatisticsServiceDaoImpl.queryDeadlineFee", info);
 
-        return businessReportFeeMonthStatisticsInfos;
+        return infos;
     }
 
     @Override