瀏覽代碼

业务逻辑日常捕获统一处理

fushengqian 1 年之前
父節點
當前提交
a15ba8c1a7
共有 17 個文件被更改,包括 67 次插入168 次删除
  1. 2 6
      fuint-application/src/main/java/com/fuint/common/service/impl/DutyServiceImpl.java
  2. 2 7
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendConfirmLogController.java
  3. 3 13
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponController.java
  4. 10 20
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponGroupController.java
  5. 5 15
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendDutyController.java
  6. 2 6
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMerchantController.java
  7. 1 6
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOpenGiftController.java
  8. 3 13
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java
  9. 14 18
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendRefundController.java
  10. 1 6
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSendLogController.java
  11. 2 10
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java
  12. 2 6
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStaffController.java
  13. 1 6
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStockController.java
  14. 7 12
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendUserCouponController.java
  15. 5 8
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCartController.java
  16. 3 8
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSettlementController.java
  17. 4 8
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSmsController.java

+ 2 - 6
fuint-application/src/main/java/com/fuint/common/service/impl/DutyServiceImpl.java

@@ -85,12 +85,8 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
         if (!merchantId.equals(tDuty.getMerchantId()) && merchantId > 0) {
             throw new BusinessRuntimeException("抱歉,您没有删除的权限");
         }
-        try {
-             tDutySourceMapper.deleteSourcesByDutyId((int) dutyId);
-             tDutyMapper.deleteById(dutyId);
-        } catch (Exception e) {
-            throw new BusinessRuntimeException("该角色已存在关联用户,无法删除");
-        }
+        tDutySourceMapper.deleteSourcesByDutyId((int) dutyId);
+        tDutyMapper.deleteById(dutyId);
     }
 
     /**

+ 2 - 7
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendConfirmLogController.java

@@ -151,7 +151,7 @@ public class BackendConfirmLogController extends BaseController {
     @ApiOperation(value = "撤销已使用的卡券")
     @RequestMapping(value = "/rollbackUserCoupon/{id}", method = RequestMethod.GET)
     @CrossOrigin
-    public ResponseObject rollbackUserCoupon(HttpServletRequest request, @PathVariable("id") Integer id) {
+    public ResponseObject rollbackUserCoupon(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         String userCouponId = (request.getParameter("userCouponId") == null || StringUtil.isEmpty(request.getParameter("userCouponId"))) ? "0" : request.getParameter("userCouponId");
 
@@ -160,12 +160,7 @@ public class BackendConfirmLogController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        try {
-            couponService.rollbackUserCoupon(id, Integer.parseInt(userCouponId), accountInfo.getAccountName());
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
-
+        couponService.rollbackUserCoupon(id, Integer.parseInt(userCouponId), accountInfo.getAccountName());
         return getSuccessResult(true);
     }
 }

+ 3 - 13
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponController.java

@@ -275,7 +275,7 @@ public class BackendCouponController extends BaseController {
     @ApiOperation(value = "保存卡券")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject saveCouponHandler(HttpServletRequest request, @RequestBody ReqCouponDto reqCouponDto) throws BusinessCheckException {
+    public ResponseObject saveCouponHandler(HttpServletRequest request, @RequestBody ReqCouponDto reqCouponDto) throws BusinessCheckException,ParseException {
         String token = request.getHeader("Access-Token");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
@@ -305,13 +305,7 @@ public class BackendCouponController extends BaseController {
         if (account.getMerchantId() != null && account.getMerchantId() > 0) {
             reqCouponDto.setMerchantId(account.getMerchantId());
         }
-
-        try {
-            couponService.saveCoupon(reqCouponDto);
-        } catch (BusinessCheckException | ParseException e) {
-            return getFailureResult(201, e.getMessage());
-        }
-
+        couponService.saveCoupon(reqCouponDto);
         return getSuccessResult(true);
     }
 
@@ -453,11 +447,7 @@ public class BackendCouponController extends BaseController {
 
         // 导入批次
         String uuid = UUID.randomUUID().toString().replaceAll("-", "");
-        try {
-            couponService.sendCoupon(Integer.parseInt(couponId), mobile, Integer.parseInt(num), uuid, accountInfo.getAccountName());
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
+        couponService.sendCoupon(Integer.parseInt(couponId), mobile, Integer.parseInt(num), uuid, accountInfo.getAccountName());
 
         MtCoupon couponInfo = couponService.queryCouponById(Integer.parseInt(couponId));
         MtUser mtUser = memberService.queryMemberByMobile(accountInfo.getMerchantId(), mobile);

+ 10 - 20
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponGroupController.java

@@ -230,16 +230,12 @@ public class BackendCouponGroupController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        try {
-            String operator = accountInfo.getAccountName();
-            ReqCouponGroupDto groupDto = new ReqCouponGroupDto();
-            groupDto.setOperator(operator);
-            groupDto.setId(id);
-            groupDto.setStatus(status);
-            couponGroupService.updateCouponGroup(groupDto);
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
+        String operator = accountInfo.getAccountName();
+        ReqCouponGroupDto groupDto = new ReqCouponGroupDto();
+        groupDto.setOperator(operator);
+        groupDto.setId(id);
+        groupDto.setStatus(status);
+        couponGroupService.updateCouponGroup(groupDto);
 
         return getSuccessResult(true);
     }
@@ -308,22 +304,16 @@ public class BackendCouponGroupController extends BaseController {
     @ApiOperation(value = "上传文件")
     @RequestMapping(value = "/upload/", method = RequestMethod.POST, produces = "text/html;charset=UTF-8")
     @CrossOrigin
-    public ResponseObject uploadFile(HttpServletRequest request, @RequestParam("fileInput") MultipartFile file) {
+    public ResponseObject uploadFile(HttpServletRequest request, @RequestParam("fileInput") MultipartFile file) throws Exception {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo == null) {
             return getFailureResult(1001, "请先登录");
         }
 
-        try {
-            String filePath = couponGroupService.saveExcelFile(file, request);
-            String uuid = couponGroupService.importSendCoupon(file, accountInfo.getAccountName(), filePath);
-            return getSuccessResult(uuid);
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        } catch (Exception e) {
-            return getFailureResult(201, e.getMessage());
-        }
+        String filePath = couponGroupService.saveExcelFile(file, request);
+        String uuid = couponGroupService.importSendCoupon(file, accountInfo.getAccountName(), filePath);
+        return getSuccessResult(uuid);
     }
 
     /**

+ 5 - 15
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendDutyController.java

@@ -151,13 +151,8 @@ public class BackendDutyController extends BaseController {
         tDuty.setStatus(status);
         tDuty.setDescription(description);
 
-        // 添加角色信息
-        try {
-            tDutyService.saveDuty(tDuty, sources);
-        } catch (Exception e) {
-            return getFailureResult(201, e.getMessage());
-        }
-
+        // 保存角色
+        tDutyService.saveDuty(tDuty, sources);
         return getSuccessResult(true);
     }
 
@@ -206,7 +201,7 @@ public class BackendDutyController extends BaseController {
     @ApiOperation(value = "修改角色")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject updateHandler(HttpServletRequest request, @RequestBody Map<String, Object> param) {
+    public ResponseObject updateHandler(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         List<Integer> menuIds = (List) param.get("menuIds");
         String id = param.get("id").toString();
@@ -239,17 +234,12 @@ public class BackendDutyController extends BaseController {
         if (menuIds.size() > 0) {
             String[] sourceIds = new String[menuIds.size()];
             for (int i = 0; i < sourceIds.length; i++) {
-                sourceIds[i] = menuIds.get(i).toString();
+                 sourceIds[i] = menuIds.get(i).toString();
             }
             sources = tSourceService.findDatasByIds(sourceIds);
         }
 
-        try {
-            tDutyService.updateDuty(duty, sources);
-        } catch (Exception e) {
-            return getFailureResult(201, e.getMessage());
-        }
-
+        tDutyService.updateDuty(duty, sources);
         return getSuccessResult(true);
     }
 

+ 2 - 6
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMerchantController.java

@@ -162,12 +162,8 @@ public class BackendMerchantController extends BaseController {
             merchantId = accountInfo.getMerchantId();
         }
 
-        try {
-            String operator = accountInfo.getAccountName();
-            merchantService.updateStatus(merchantId, operator, status);
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
+        String operator = accountInfo.getAccountName();
+        merchantService.updateStatus(merchantId, operator, status);
 
         return getSuccessResult(true);
     }

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

@@ -212,12 +212,7 @@ public class BackendOpenGiftController extends BaseController {
         reqDto.setId(id);
         reqDto.setStatus(status);
 
-        try {
-            openGiftService.updateOpenGift(reqDto);
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
-
+        openGiftService.updateOpenGift(reqDto);
         return getSuccessResult(true);
     }
 

+ 3 - 13
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java

@@ -324,12 +324,7 @@ public class BackendOrderController extends BaseController {
             orderDto.setOrderMode(orderMode);
         }
 
-        try {
-            orderService.updateOrder(orderDto);
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
-
+        orderService.updateOrder(orderDto);
         return getSuccessResult(true);
     }
 
@@ -341,7 +336,7 @@ public class BackendOrderController extends BaseController {
     @ApiOperation(value = "验证并核销订单")
     @RequestMapping(value = "/verify", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject verify(HttpServletRequest request, @RequestBody Map<String, Object> param) {
+    public ResponseObject verify(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         Integer orderId = param.get("orderId") == null ? 0 : Integer.parseInt(param.get("orderId").toString());
         String remark = param.get("remark") == null ? "" : param.get("remark").toString();
@@ -366,12 +361,7 @@ public class BackendOrderController extends BaseController {
             orderDto.setVerifyCode(verifyCode);
         }
 
-        try {
-            orderService.updateOrder(orderDto);
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
-
+        orderService.updateOrder(orderDto);
         return getSuccessResult(true);
     }
 

+ 14 - 18
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendRefundController.java

@@ -208,24 +208,20 @@ public class BackendRefundController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
         String operator = accountInfo.getAccountName();
-        try {
-            if (status.equals(RefundStatusEnum.REJECT.getKey())) {
-                RefundDto dto = new RefundDto();
-                dto.setId(refundId);
-                dto.setOperator(operator);
-                dto.setStatus(RefundStatusEnum.REJECT.getKey());
-                dto.setRemark(remark);
-                refundService.updateRefund(dto);
-            } else {
-                RefundDto dto = new RefundDto();
-                dto.setId(refundId);
-                dto.setOperator(operator);
-                dto.setStatus(RefundStatusEnum.APPROVED.getKey());
-                dto.setRemark(remark);
-                refundService.agreeRefund(dto);
-            }
-        } catch (Exception e) {
-            return getFailureResult(201, e.getMessage());
+        if (status.equals(RefundStatusEnum.REJECT.getKey())) {
+            RefundDto dto = new RefundDto();
+            dto.setId(refundId);
+            dto.setOperator(operator);
+            dto.setStatus(RefundStatusEnum.REJECT.getKey());
+            dto.setRemark(remark);
+            refundService.updateRefund(dto);
+        } else {
+            RefundDto dto = new RefundDto();
+            dto.setId(refundId);
+            dto.setOperator(operator);
+            dto.setStatus(RefundStatusEnum.APPROVED.getKey());
+            dto.setRemark(remark);
+            refundService.agreeRefund(dto);
         }
         return getSuccessResult(true);
     }

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

@@ -138,12 +138,7 @@ public class BackendSendLogController extends BaseController {
             return getFailureResult(201, "系统参数有误");
         }
 
-        try {
-            couponService.removeUserCoupon(id, sendLog.getUuid(), accountInfo.getAccountName());
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
-
+        couponService.removeUserCoupon(id, sendLog.getUuid(), accountInfo.getAccountName());
         return getSuccessResult(true);
     }
 }

+ 2 - 10
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java

@@ -143,11 +143,7 @@ public class BackendSourceController extends BaseController {
         } else {
             addSource.setSourceLevel(1);
         }
-        try {
-            sSourceService.addSource(addSource);
-        } catch (Exception e) {
-            return getFailureResult(201, e.getMessage());
-        }
+        sSourceService.addSource(addSource);
         return getSuccessResult(true);
     }
 
@@ -210,11 +206,7 @@ public class BackendSourceController extends BaseController {
         } else {
             editSource.setSourceLevel(1);
         }
-        try {
-            sSourceService.editSource(editSource);
-        } catch (Exception e) {
-            return getFailureResult(201, e.getMessage());
-        }
+        sSourceService.editSource(editSource);
         return getSuccessResult(true);
     }
 

+ 2 - 6
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStaffController.java

@@ -186,12 +186,8 @@ public class BackendStaffController extends BaseController {
                 return getFailureResult(201, "该手机号码已经存在");
             }
         }
-        try {
-            staffService.saveStaff(mtStaff);
-            return getSuccessResult(true);
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
+        staffService.saveStaff(mtStaff);
+        return getSuccessResult(true);
     }
 
     /**

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

@@ -202,12 +202,7 @@ public class BackendStockController extends BaseController {
         info.setType(type);
         String operator = accountDto.getAccountName();
         info.setOperator(operator);
-        try {
-            stockService.addStock(info, goodsList);
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
-
+        stockService.addStock(info, goodsList);
         return getSuccessResult(true);
     }
 

+ 7 - 12
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendUserCouponController.java

@@ -35,7 +35,7 @@ import java.math.BigDecimal;
 import java.util.*;
 
 /**
- * 会员卡券统计管理controller
+ * 会员卡券统计管理controller
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
@@ -77,6 +77,9 @@ public class BackendUserCouponController extends BaseController {
     @Autowired
     private AccountService accountService;
 
+    /**
+     * 卡券发放记录接口
+     * */
     @Autowired
     private SendLogService sendLogService;
 
@@ -183,12 +186,7 @@ public class BackendUserCouponController extends BaseController {
             confirmAmount = mtUserCoupon.getBalance();
         }
 
-        try {
-            couponService.useCoupon(Integer.parseInt(userCouponId), accountInfo.getId(), storeId, 0, confirmAmount, "后台核销");
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
-
+        couponService.useCoupon(Integer.parseInt(userCouponId), accountInfo.getId(), storeId, 0, confirmAmount, "后台核销");
         return getSuccessResult(true);
     }
 
@@ -209,11 +207,8 @@ public class BackendUserCouponController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        try {
-            couponService.deleteUserCoupon(id, accountInfo.getAccountName());
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
+        // 删除会员的卡券
+        couponService.deleteUserCoupon(id, accountInfo.getAccountName());
 
         // 发券记录,部分作废
         MtUserCoupon userCoupon = mtUserCouponMapper.selectById(id);

+ 5 - 8
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCartController.java

@@ -141,14 +141,11 @@ public class ClientCartController extends BaseController {
         mtCart.setIsVisitor(YesOrNoEnum.NO.getKey());
         mtCart.setMerchantId(merchantId);
 
-        try {
-            Integer id = cartService.saveCart(mtCart, action);
-            Map<String, Object> data = new HashMap();
-            data.put("cartId", id);
-            return getSuccessResult(data);
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
+        Integer id = cartService.saveCart(mtCart, action);
+        Map<String, Object> data = new HashMap();
+        data.put("cartId", id);
+
+        return getSuccessResult(data);
     }
 
     /**

+ 3 - 8
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSettlementController.java

@@ -9,7 +9,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
@@ -36,12 +35,8 @@ public class ClientSettlementController extends BaseController {
     @ApiOperation(value = "提交订单结算")
     @RequestMapping(value = "/submit", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject submit(HttpServletRequest request, @RequestBody SettlementParam param) {
-        try {
-            Map<String, Object> result = settlementService.doSubmit(request, param);
-            return getSuccessResult(result);
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
-        }
+    public ResponseObject submit(HttpServletRequest request, @RequestBody SettlementParam param) throws BusinessCheckException {
+        Map<String, Object> result = settlementService.doSubmit(request, param);
+        return getSuccessResult(result);
     }
 }

+ 4 - 8
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSmsController.java

@@ -114,13 +114,9 @@ public class ClientSmsController extends BaseController {
         Integer merchantId = merchantService.getMerchantId(merchantNo);
 
         // 短信模板
-        try {
-            Map<String, String> params = new HashMap<>();
-            params.put("code", verifyCode);
-            result = sendSmsService.sendSms(merchantId,"login-code", mobileList, params);
-            return getSuccessResult(result);
-        } catch (Exception e) {
-            return getFailureResult(201, e.getMessage());
-        }
+        Map<String, String> params = new HashMap<>();
+        params.put("code", verifyCode);
+        result = sendSmsService.sendSms(merchantId,"login-code", mobileList, params);
+        return getSuccessResult(result);
     }
 }