商家收货地址和用户填写快递信息

yami-shop-api/src/main/java/com/yami/shop/api/controller/RefundDeliveryController.java

@@ -84,15 +84,14 @@ public class RefundDeliveryController {
         .eq(RefundAddr::getShopId, refundDelivery.getShopId())
         .eq(RefundAddr::getDefaultAddr, 1)
         .eq(RefundAddr::getStatus, 1));
-        if (ObjectUtil.isEmpty(refundAddr)){
-            throw new GlobalException("门店退货地址信息不存在!");
+        if (ObjectUtil.isNotEmpty(refundAddr)) {
+            //门店信息获取地址
+            String shopAddress = refundAddr.getProvince() + refundAddr.getCity() + refundAddr.getArea() + refundAddr.getAddr();
+            refundDelivery.setReceiverAddr(shopAddress);
+            refundDelivery.setReceiverName(refundAddr.getReceiverName());
+            refundDelivery.setReceiverMobile(refundAddr.getReceiverMobile());
+            refundDeliveryService.save(refundDelivery);
         }
-        //门店信息获取地址
-        String shopAddress = refundAddr.getProvince() + refundAddr.getCity() + refundAddr.getArea() + refundAddr.getAddr();
-        refundDelivery.setReceiverAddr(shopAddress);
-        refundDelivery.setReceiverName(refundAddr.getReceiverName());
-        refundDelivery.setReceiverMobile(refundAddr.getReceiverMobile());
-        refundDeliveryService.save(refundDelivery);
         //添加填写物流信息轨迹
         OrderRefund orderRefund = orderRefundService.getOne(new LambdaQueryWrapper<OrderRefund>().eq(OrderRefund::getRefundSn, refundDelivery.getRefundSn()));
 

yami-shop-platform/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 spring:
   # 环境 dev|prod|docker quartz定时任务
   profiles:
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
   #文件上传设置
   servlet:
 

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/StoreManagementService.java

@@ -194,9 +194,9 @@ public class StoreManagementService implements IStoreManagementService {
 
             //添加商家退货地址
             int count = refundAddrService.count(new LambdaQueryWrapper<RefundAddr>()
-                    .eq(RefundAddr::getShopId, shopDetailInfo)
+                    .eq(RefundAddr::getShopId, shopDetailInfo.getShopId())
                     .eq(RefundAddr::getStatus, 1));
-            if (count<1){
+            if (count>0){
                 log.info("门店存在退货地址无需添加!");
             }else {
                 log.info("门店不存在退货地址，添加默认地址!");