From 3b8100c9b5e00e627b33c25f80fedac98e00b7dd Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 19 一月 2026 16:22:04 +0800
Subject: [PATCH] 小程序   接口开发

---
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index a8a17a7..f098231 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -40,6 +40,7 @@
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import okhttp3.Address;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.checkerframework.checker.units.qual.C;
@@ -97,6 +98,9 @@
     private ShopMapper shopMapper;
 
     @Autowired
+    private LabelsMapper labelsMapper;
+
+    @Autowired
     private ShopGoodsRelationMapper relationMapper;
 
     @Autowired
@@ -137,6 +141,9 @@
 
     @Autowired
     private AreasService areasService;
+
+    @Autowired
+    private AreasMapper areasMapper;
 
     @Autowired
     private GoodsorderDetailJoinMapper goodsorderDetailJoinMapper;
@@ -794,8 +801,7 @@
         goodsorder.setPrice(orderPayConfirmResponse.getPayAmount());
         goodsorder.setTotalPrice(orderPayConfirmResponse.getAmount());
         goodsorder.setUseIntegral(orderPayConfirmResponse.getDeductIntegral());
-        goodsorder.setIntegral(goodsorder.getUseIntegral());
-        goodsorder.setIntegralPrice(orderPayConfirmResponse.getIntegralAmount());
+        goodsorder.setIntegral(orderPayConfirmResponse.getIntegralAmount());
         goodsorder.setMailPrice(orderPayConfirmResponse.getMailAmount());
         goodsorder.setPayMethod(goodsorder.getPrice().compareTo(BigDecimal.ZERO)>Constants.ZERO?Constants.ZERO:Constants.ONE);
         if(Objects.nonNull(orderPayConfirmResponse.getMemberCoupon())){
@@ -1064,7 +1070,6 @@
             member.setImgFullUrl(memberfullUrl + member.getImgurl());
             memberOrderResponse.setMember(member);
         }
-
         return memberOrderResponse;
     }
 
@@ -1384,7 +1389,36 @@
         //閭垂閲戦
         if(Objects.nonNull(request.getReceiveType())){
             if(Constants.equalsInteger(request.getReceiveType(),Constants.ZERO)){
+                if(Objects.nonNull(request.getAddressId())){
+                    Addr addr = addrMapper.selectById(request.getAddressId());
+                    if(Objects.isNull(addr)){
+                        throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏀惰揣鍦板潃淇℃伅");
+                    }
+                    Areas areas = areasMapper.selectOne(new QueryWrapper<Areas>().lambda()
+                            .eq(Areas::getIsdeleted,Constants.ZERO)
+                            .eq(Areas::getId,StringUtils.leftPad(addr.getAreaId().toString().substring(0,2),6,"0"))
+                            .isNotNull(Areas::getYunFeeId)
+                            .last(" limit 1 ")
+                    );
+                    if(Objects.nonNull(areas)){
+                        Labels  labels = labelsMapper.selectById(areas.getYunFeeId());
+                        if(Objects.nonNull(labels)&&StringUtils.isNotBlank(labels.getParam())){
+                            //{weight0:10,fee0:10,weight1:10,fee1:10},{棣栭噸:10,棣栭噸杩愯垂锛�10,缁噸锛�10,缁噸璐癸細10}
+
+                        }
+
+                    }
+
+
+
+                }
+
+
+
                 //TODO  鏍规嵁鏀惰揣鍦板潃 鏌ヨ杩愯垂閰嶇疆
+
+
+
                 //璁$畻鍟嗗搧淇℃伅鎬婚噸閲�
                 BigDecimal totalWeight = goodsCalculateList.stream().map(i->
                         i.getWeight().multiply(new BigDecimal(i.getGoodsNum().toString()))

--
Gitblit v1.9.3