From f39fe1a419d2d83dc8b043ceca083ad6ff4f7e1b Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Tue, 24 Sep 2024 13:30:27 +0800
Subject: [PATCH] 1

---
 .../custom/controller/admin/CustomerCouponController.java   | 3 ---
 .../custom/controller/admin/CustomerMainController.java     | 1 -
 .../custom/service/impl/CustomerActiveServiceImpl.java      | 1 +
 .../custom/service/impl/CustomerCouponServiceImpl.java      | 6 +++---
 .../yudao/module/custom/vo/CustomerActiveSaveReqVO.java     | 2 ++
 .../main/resources/mapper/custom/CustomerCouponMapper.xml   | 1 +
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerCouponController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerCouponController.java
index 70951a5d..cc1fe147 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerCouponController.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerCouponController.java
@@ -39,7 +39,6 @@ public class CustomerCouponController {
      **/
     @PostMapping("/couponVerification")
     @Operation(summary = "核销用户卡券")
-    @PreAuthorize("@ss.hasPermission('base:customer-coupon:create')")
     public CommonResult<Boolean> createCustomerCoupon(@Valid @RequestBody CustomerCouponSaveReqVO saveReqVO) {
         customerCouponService.couponVerification(saveReqVO);
         return success(true);
@@ -57,7 +56,6 @@ public class CustomerCouponController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除用户卡券")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:customer-coupon:delete')")
     public CommonResult<Boolean> deleteCustomerCoupon(@RequestParam("id") String id) {
         customerCouponService.deleteCustomerCoupon(id);
         return success(true);
@@ -74,7 +72,6 @@ public class CustomerCouponController {
     @GetMapping("/get")
     @Operation(summary = "获得用户卡券")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('base:customer-coupon:query')")
     public CommonResult<CustomerCouponRespVO> getCustomerCoupon(@RequestParam("id") String id) {
         return success(customerCouponService.getCustomerCoupon(id));
     }
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java
index 9cfdc8b9..b1c5ccc1 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java
@@ -129,7 +129,6 @@ public class CustomerMainController {
     @GetMapping("/get")
     @Operation(summary = "获得客户管理")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('base:customer-main:query')")
     public CommonResult<CustomerMainRespVO> getCustomerMain(@RequestParam("id") String id) {
         return success(customerMainService.getCustomerById(id));
     }
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerActiveServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerActiveServiceImpl.java
index a1994ab7..413cdd7b 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerActiveServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerActiveServiceImpl.java
@@ -147,6 +147,7 @@ public class CustomerActiveServiceImpl extends ServiceImpl<CustomerActiveMapper,
             orderInfo.setOrderTime(LocalDateTime.now());
             orderInfo.setIsOnline("01");
             orderInfo.setOrderStatus("0");
+            orderInfo.setPayType(saveReqVO.getAccountType());
             repairOrderInfoService.save(orderInfo);
             //保存余额信息
 //            balanceService.updateByCusId(balance);
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerCouponServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerCouponServiceImpl.java
index aebe02f7..703684fd 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerCouponServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerCouponServiceImpl.java
@@ -48,7 +48,7 @@ public class CustomerCouponServiceImpl extends ServiceImpl<CustomerCouponMapper,
     public void couponVerification(CustomerCouponSaveReqVO saveReqVO) {
         CustomerCoupon customerCoupon = getById(saveReqVO.getId());
         //核销后剩余
-        BigDecimal newBalance = customerCoupon.getBalance().subtract(saveReqVO.getChangeBalance());
+        BigDecimal newBalance = customerCoupon.getBalance().subtract(customerCoupon.getUnitPrice());
         customerCoupon.setBalance(newBalance);
         if (newBalance.compareTo(BigDecimal.ZERO) == 0) {
             customerCoupon.setIsValid(GENERAL_NO);
@@ -62,9 +62,9 @@ public class CustomerCouponServiceImpl extends ServiceImpl<CustomerCouponMapper,
                 BALANCE_CHANGE_TYPE_KQHX,
                 BALANCE_CHANGE_MAIN_KQ,
                 saveReqVO.getOutRule(),
-                saveReqVO.getChangeBalance(),
+                saveReqVO.getUnitPrice(),
                 newBalance,
-                "核销" + saveReqVO.getCouponName() + saveReqVO.getChangeBalance() + "次/元，核销后剩余" + newBalance + "次/元"
+                "核销" + saveReqVO.getCouponName() + saveReqVO.getUnitPrice() + "次/元，核销后剩余" + newBalance + "次/元"
         );
     }
 
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerActiveSaveReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerActiveSaveReqVO.java
index 9df90275..c08dc23f 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerActiveSaveReqVO.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerActiveSaveReqVO.java
@@ -14,6 +14,8 @@ import javax.validation.constraints.*;
 public class CustomerActiveSaveReqVO extends CustomerActive {
     /**充值金额*/
     private BigDecimal topUpAmount;
+    /**充值金额*/
+    private String accountType;
     /**选中的优惠券*/
     private List<MemberCoupon> selectCoupon;
 }
\ No newline at end of file
diff --git a/dl-module-base/src/main/resources/mapper/custom/CustomerCouponMapper.xml b/dl-module-base/src/main/resources/mapper/custom/CustomerCouponMapper.xml
index d35a7c11..da826a10 100644
--- a/dl-module-base/src/main/resources/mapper/custom/CustomerCouponMapper.xml
+++ b/dl-module-base/src/main/resources/mapper/custom/CustomerCouponMapper.xml
@@ -28,5 +28,6 @@
         WHERE
             bcc.cus_id = #{cusId}
           AND bcc.deleted = 0
+        AND bcc.is_valid = 1
     </select>
 </mapper>
\ No newline at end of file