Bläddra i källkod

fixed 代码规范修复

fushengqian 1 år sedan
förälder
incheckning
e29c7fea49

+ 2 - 2
fuint-application/src/main/java/com/fuint/common/service/CommissionLogService.java

@@ -45,9 +45,9 @@ public interface CommissionLogService extends IService<MtCommissionLog> {
     /**
      * 更新分销提成记录
      *
-     * @param commissionLogRequest 请求参数
+     * @param requestParam 请求参数
      * @throws BusinessCheckException
      * @return
      */
-    void updateCommissionLog(CommissionLogRequest commissionLogRequest) throws BusinessCheckException;
+    void updateCommissionLog(CommissionLogRequest requestParam) throws BusinessCheckException;
 }

+ 16 - 14
fuint-application/src/main/java/com/fuint/common/service/impl/CommissionLogServiceImpl.java

@@ -162,6 +162,7 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
      */
     @Override
     @Transactional
+    @OperationServiceLog(description = "计算订单分销提成")
     public void calculateCommission(Integer orderId) throws BusinessCheckException {
         if (orderId != null && orderId > 0) {
             MtOrder mtOrder = orderService.getById(orderId);
@@ -201,8 +202,9 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
                                  mtCommissionLog.setRuleItemId(mtCommissionRuleItem.getId());
                                  mtCommissionLog.setCashId(0);
                                  mtCommissionLog.setCashTime(null);
-                                 mtCommissionLog.setCreateTime(new Date());
-                                 mtCommissionLog.setUpdateTime(new Date());
+                                 Date dateTime = new Date();
+                                 mtCommissionLog.setCreateTime(dateTime);
+                                 mtCommissionLog.setUpdateTime(dateTime);
                                  mtCommissionLog.setStatus(StatusEnum.ENABLED.getKey());
                                  mtCommissionLog.setOperator(null);
                                  boolean flag = true;
@@ -256,31 +258,31 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
     /**
      * 更新分销提成记录
      *
-     * @param commissionLogRequest 请求参数
+     * @param requestParam 请求参数
      * @return
      */
     @Override
     @Transactional
     @OperationServiceLog(description = "更新分销提成记录")
-    public void updateCommissionLog(CommissionLogRequest commissionLogRequest) throws BusinessCheckException {
-        MtCommissionLog mtCommissionLog =  mtCommissionLogMapper.selectById(commissionLogRequest.getId());
+    public void updateCommissionLog(CommissionLogRequest requestParam) throws BusinessCheckException {
+        MtCommissionLog mtCommissionLog =  mtCommissionLogMapper.selectById(requestParam.getId());
         if (mtCommissionLog == null) {
             logger.error("更新分销提成记录失败...");
             throw new BusinessCheckException("更新分销提成记录失败,该记录不存在");
         }
-        if (commissionLogRequest.getAmount() != null) {
-            mtCommissionLog.setAmount(new BigDecimal(commissionLogRequest.getAmount()));
+        if (requestParam.getAmount() != null) {
+            mtCommissionLog.setAmount(new BigDecimal(requestParam.getAmount()));
         }
-        if (commissionLogRequest.getDescription() != null) {
-            mtCommissionLog.setDescription(commissionLogRequest.getDescription());
+        if (requestParam.getDescription() != null) {
+            mtCommissionLog.setDescription(requestParam.getDescription());
         }
-        if (commissionLogRequest.getStatus() != null) {
-            mtCommissionLog.setStatus(commissionLogRequest.getStatus());
+        if (requestParam.getStatus() != null) {
+            mtCommissionLog.setStatus(requestParam.getStatus());
         }
-        if (commissionLogRequest.getSettleUuid() != null) {
-            mtCommissionLog.setSettleUuid(commissionLogRequest.getSettleUuid());
+        if (requestParam.getSettleUuid() != null) {
+            mtCommissionLog.setSettleUuid(requestParam.getSettleUuid());
         }
-        mtCommissionLog.setOperator(commissionLogRequest.getOperator());
+        mtCommissionLog.setOperator(requestParam.getOperator());
         mtCommissionLog.setUpdateTime(new Date());
         mtCommissionLogMapper.updateById(mtCommissionLog);
     }

+ 1 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBalanceController.java

@@ -258,7 +258,7 @@ public class BackendBalanceController extends BaseController {
     @RequestMapping(value = "/saveSetting", method = RequestMethod.POST)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('balance:setting')")
-    public ResponseObject saveSettingHandler(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
+    public ResponseObject saveSetting(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         String status = param.get("status") == null ? StatusEnum.ENABLED.getKey() : param.get("status").toString();
         String remark = param.get("remark") == null ? "" : param.get("remark").toString();

+ 1 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendPointController.java

@@ -177,7 +177,7 @@ public class BackendPointController extends BaseController {
     @RequestMapping(value = "/saveSetting", method = RequestMethod.POST)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('point:setting')")
-    public ResponseObject saveSettingHandler(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
+    public ResponseObject saveSetting(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         String pointNeedConsume = param.get("pointNeedConsume") != null ? param.get("pointNeedConsume").toString() : "1";
         String canUsedAsMoney = param.get("canUsedAsMoney") != null ? param.get("canUsedAsMoney").toString() : "false";

+ 0 - 1
fuint-application/src/main/java/com/fuint/module/schedule/CouponExpireJob.java

@@ -20,7 +20,6 @@ import org.springframework.core.env.Environment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.*;
 
 /**