添加操作日志

src/main/java/cn/quantgroup/cashloanflowboss/api/optlog/model/OptEnumName.java

@@ -16,7 +16,9 @@ public enum OptEnumName {
     PAY("放款操作"),
     PRE_CANCEL("贷前关单操作"),
     LOAN_CANCEL("贷后关单操作"),
-    ALL_REPAID("结清订单操作");
+    ALL_REPAID("结清订单操作"),
+    USER_INFO_CLEAN("清除用户信息操作"),
+    USER_ORDER_CLEAN("清除用户活跃订单操作");
 
     private String desc;
 

src/main/java/cn/quantgroup/cashloanflowboss/api/order/controller/OrderController.java

@@ -137,7 +137,8 @@ public class OrderController {
     @PostMapping("/cancel/loan")
     public Result<Boolean> cancelPreLoan(@RequestParam @Valid String channelOrderNumber) {
         if (Application.isDebug()) {
-            return Result.buildSuccess(this.orderService.cancelPreLoan(channelOrderNumber));
+          Tuple<Boolean, String> preLoan = this.orderService.cancelPreLoan(channelOrderNumber);
+          return Result.buildSuccess(preLoan.getKey(),preLoan.getValue());
         } else {
             return Result.buildSuccess(false,"无此操作");
         }
@@ -152,7 +153,8 @@ public class OrderController {
     @PostMapping("/cancel/after/loan")
     public Result<Boolean> cancelAfterLoan(@RequestParam @Valid String channelOrderNumber) {
         if (Application.isDebug()) {
-            return Result.buildSuccess(this.orderService.cancelAfterLoan(channelOrderNumber));
+          Tuple<Boolean, String> afterLoan = this.orderService.cancelAfterLoan(channelOrderNumber);
+          return Result.buildSuccess(afterLoan.getKey(),afterLoan.getValue());
         } else {
             return Result.buildSuccess(false,"无此操作");
         }

src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/OrderService.java

@@ -43,9 +43,9 @@ public interface OrderService {
 
     HistoryOrderStatusVoModel getOrderHistoryStatus(String channelOrderNumber);
 
-    boolean cancelPreLoan(String channelOrderNumber);
+    Tuple<Boolean,String> cancelPreLoan(String channelOrderNumber);
 
-    boolean cancelAfterLoan(String channelOrderNumber);
+    Tuple<Boolean,String> cancelAfterLoan(String channelOrderNumber);
 
     List<CallbackRecordVoModel> getOrderCallbackRecordList(String channelOrderNumber);
 

src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/OrderServiceImpl.java

@@ -487,15 +487,16 @@ public class OrderServiceImpl implements OrderService{
      * @param
      * @return
      */
+    @OperationAnno(channelNo = "#this[0]", opt = OptEnumName.PRE_CANCEL, succSPEL = "#this.key", optDetailSPEL = "#this.value")
     @Override
-    public boolean cancelPreLoan(String channelOrderNumber) {
+    public Tuple<Boolean,String> cancelPreLoan(String channelOrderNumber) {
         boolean cancel = true;
         String token = null;
         String result = "";
         ClfOrderMapping orderMapping = clfOrderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
         if (orderMapping == null) {
             log.info("cancelPreLoan,贷前关单失败，无订单 channelOrderNumber={}", channelOrderNumber);
-            return false;
+            return new Tuple<>(false,"贷前关单失败，无订单");
         }
         try{
             Long id = cancelPreLoanRepository.cancelPreLoan(orderMapping.getApplyNo());
@@ -527,7 +528,7 @@ public class OrderServiceImpl implements OrderService{
             cancel = false;
             log.error(e.getMessage(),e);
         }
-        return cancel;
+        return new Tuple<>(cancel,cancel?"贷前关单成功":"贷前关单失败");
     }
 
     /**
@@ -536,18 +537,19 @@ public class OrderServiceImpl implements OrderService{
      * @param
      * @return
      */
+    @OperationAnno(channelNo = "#this[0]", opt = OptEnumName.LOAN_CANCEL, succSPEL = "#this.key", optDetailSPEL = "#this.value")
     @Override
-    public boolean cancelAfterLoan(String channelOrderNumber) {
+    public Tuple<Boolean,String> cancelAfterLoan(String channelOrderNumber) {
 
         ClfOrderMapping orderMapping = this.clfOrderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
 
         if (orderMapping == null) {
             log.info("cancelAfterLoan,贷后关单失败，无订单  ={}", channelOrderNumber);
-            return false;
+            return new Tuple<>(false,"贷后关单失败，无订单");
         }
         if (orderMapping.getLoanId() == null) {
             log.info("cancelAfterLoan,贷后关单失败，loanId为空，channelOrderNumber={}", channelOrderNumber);
-            return false;
+            return new Tuple<>(false,"贷后关单失败，loanId为空");
         }
         ConcurrentMap<Object, Object> data = Maps.newConcurrentMap();
         data.put("loanId",orderMapping.getLoanId());
@@ -555,7 +557,7 @@ public class OrderServiceImpl implements OrderService{
         data.put("flowNo", UUID.randomUUID());
         String id = clothoCenterService.cancelAfterLoan(data);
 
-        return true;
+        return new Tuple<>(false,"贷后关单成功");
     }
 
     /**

src/main/java/cn/quantgroup/cashloanflowboss/api/user/controller/UserController.java

@@ -9,6 +9,7 @@ import cn.quantgroup.cashloanflowboss.api.user.service.UserServiceImpl;
 import cn.quantgroup.cashloanflowboss.component.security.annotiation.Security;
 import cn.quantgroup.cashloanflowboss.component.validator.constraints.NotEmpty;
 import cn.quantgroup.cashloanflowboss.core.base.Result;
+import cn.quantgroup.cashloanflowboss.core.base.Tuple;
 import cn.quantgroup.cashloanflowboss.spi.user.service.XyqbUserService;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -128,7 +129,7 @@ public class UserController {
      * @return
      */
     @PutMapping("/order/clean")
-    public Boolean cleanUserOrder(@RequestParam @Valid @NotEmpty(message = "无效的用户手机号") String mobile) {
+    public Tuple<Boolean,String> cleanUserOrder(@RequestParam @Valid @NotEmpty(message = "无效的用户手机号") String mobile) {
         return this.xyqbUserService.cleanUserOrder(mobile);
     }
 

src/main/java/cn/quantgroup/cashloanflowboss/spi/user/service/XyqbUserService.java

 package cn.quantgroup.cashloanflowboss.spi.user.service;
 
+import cn.quantgroup.cashloanflowboss.core.base.Tuple;
 import cn.quantgroup.user.bean.UserInfo;
 import cn.quantgroup.user.retbean.XUser;
 import cn.quantgroup.user.retbean.XUserDetail;
@@ -63,7 +64,7 @@ public interface XyqbUserService {
      * @param phoneNo
      * @return
      */
-    Boolean cleanUserOrder(String phoneNo);
+    Tuple<Boolean,String> cleanUserOrder(String phoneNo);
 
     /**
      * 删除记录

src/main/java/cn/quantgroup/cashloanflowboss/spi/user/service/XyqbUserServiceImpl.java

 package cn.quantgroup.cashloanflowboss.spi.user.service;
 
+import cn.quantgroup.cashloanflowboss.api.optlog.model.OptEnumName;
+import cn.quantgroup.cashloanflowboss.core.annotation.opt.OperationAnno;
+import cn.quantgroup.cashloanflowboss.core.base.Tuple;
 import cn.quantgroup.cashloanflowboss.spi.jolyne.JolyneCenter;
 import cn.quantgroup.cashloanflowboss.spi.user.repository.UserDetailRepository;
 import cn.quantgroup.cashloanflowboss.spi.user.repository.UserExtInfoRepository;
@@ -164,11 +167,12 @@ public class XyqbUserServiceImpl implements XyqbUserService {
      * @param phoneNo
      * @return
      */
-    public Boolean cleanUserOrder(String phoneNo){
+    @OperationAnno(channelNo = "#this[0]", opt = OptEnumName.USER_ORDER_CLEAN, succSPEL = "#this.key", optDetailSPEL = "#this.value")
+    public Tuple<Boolean,String> cleanUserOrder(String phoneNo){
         UserSysResult<XUser> xUser = userSysService.getService().findUserByPhoneNo(phoneNo);
         if (xUser == null || xUser.getData() == null) {
             LOGGER.info("cleanUserOrder,清除用户活跃订单失败，未找到用户 phoneNo={}", phoneNo);
-            return false;
+            return new Tuple<>(false,"清除用户活跃订单失败，未找到用户");
         }
         Long userId = xUser.getData().getId();
         ConcurrentMap<Object, Object> data = Maps.newConcurrentMap();
@@ -182,7 +186,8 @@ public class XyqbUserServiceImpl implements XyqbUserService {
         data.put("sql",cancel_list);
         String cancel_result = jolyneCenter.executeXYQBSQL(JSONTools.serialize(data));
         JSONObject resp = JSONObject.parseObject(cancel_result);
-        return (Objects.nonNull(resp) && resp.containsKey("code"))?"0000".equals(resp.get("code")):false;
+        boolean result = (Objects.nonNull(resp) && resp.containsKey("code")) ? "0000".equals(resp.get("code")) : false;
+        return new Tuple<>(result,result?"清除用户活跃订单成功":"清除用户活跃订单失败");
     }
 
     @Override public Boolean deleteByUserId(String phoneNo) {