From 2937a271acf9237edeccf23cca52804ff0aef710 Mon Sep 17 00:00:00 2001
From: seesaw <seesawgzz@gmail.com>
Date: Fri, 18 Oct 2024 14:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/store/AppStoreController.java  | 15 +++++----------
 .../storeorderdetail/StoreOrderDetailDO.java      |  5 +++++
 .../service/storeorder/StoreOrderServiceImpl.java | 15 +++++++++------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java
index a705bc60..e1bb923c 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.member.controller.app.store;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.StoreResult;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -179,21 +180,15 @@ public class AppStoreController {
     @Operation(summary = "添加二维码订单")
     public String payByCodeOrder(@RequestBody StoreOrderDto dto) {
 
-        String s = orderService.cardPay(dto);
+        String s = orderService.codePay(dto);
 
-        if("true".equals(s)){
-            return JsonUtils.toJsonString(StoreResult.success(null));
-        } else if ("false".equals(s)) {
-            return JsonUtils.toJsonString(StoreResult.fail("余额不足"));
-        }else {
+        if(StrUtil.isNotBlank(s)){
             return JsonUtils.toJsonString(StoreResult.fail(s));
+        }else {
+            return JsonUtils.toJsonString(StoreResult.success(null));
         }
     }
 
-
-
-
-
     public  String reverseHexAndConvert(String hexStr) {
         // 将十六进制字符串反转，每两位一组
         StringBuilder reversedHex = new StringBuilder();
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorderdetail/StoreOrderDetailDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorderdetail/StoreOrderDetailDO.java
index a50bc0e9..91b07cac 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorderdetail/StoreOrderDetailDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorderdetail/StoreOrderDetailDO.java
@@ -44,4 +44,9 @@ public class StoreOrderDetailDO extends BaseDO {
      */
     private Integer number;
 
+    /**
+     * 重量
+     */
+    private Double weight;
+
 }
\ No newline at end of file
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java
index 800d82ac..2c769b0d 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java
@@ -160,14 +160,17 @@ public class StoreOrderServiceImpl implements StoreOrderService {
     public String codePay(StoreOrderDto dto) {
         String s = validateJWT(dto.getJwt());
         if (StrUtil.isBlank(s)) {
-            return "false";
+            return "二维码过期";
         }
+        MemberUserDO user = userService.getUser(Long.valueOf(s));
+        Double totalPrice = createOrder(dto).getTotalPrice();
+        BigDecimal total = BigDecimal.valueOf(totalPrice).setScale(2, RoundingMode.HALF_UP);
 
-
-
-
-
-        return "";
+        BigDecimal compute = compute(total, user.getId());
+        if (compute.compareTo(BigDecimal.ZERO) < 0) {
+            return "金额不足";
+        }
+        return null;
     }
 
     @Override