代码提交

src/main/java/org/springblade/modules/desk/controller/OrderController.java

@@ -133,7 +133,7 @@ public class OrderController {
 		// 设置默认地址
 		WeChatAddress address = AddressCache.getAddress(info.getBuyerPhone());
 		if (Func.isNotEmpty(address)) {
-			info.setAddress(address.getArea().concat(address.getAddress()));
+			info.setAddress(address.getProvince().concat(address.getCity()).concat(address.getArea()).concat(address.getAddress()));
 			info.setConsignee(address.getConsignee());
 			info.setConsigneePhone(address.getPhone());
 		}

src/main/java/org/springblade/modules/desk/mapper/OrderMapper.xml

@@ -16,6 +16,7 @@
         <result column="goods_name" property="goodsName"/>
         <result column="goods_num" property="goodsNum"/>
         <result column="goods_price" property="goodsPrice"/>
+        <result column="goods_price" property="totalPrice"/>
         <result column="buyer_id" property="buyerId"/>
         <result column="buyer_name" property="buyerName"/>
         <result column="buyer_phone" property="buyerPhone"/>

src/main/java/org/springblade/modules/weixin/service/impl/WeChatAddressServiceImpl.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.weixin.entity.WeChatAddress;
 import org.springblade.modules.weixin.entity.WeChatUser;
 import org.springblade.modules.weixin.mapper.WeChatAddressMapper;
@@ -34,43 +35,36 @@ import org.springframework.transaction.annotation.Transactional;
 @AllArgsConstructor
 public class WeChatAddressServiceImpl extends BaseServiceImpl<WeChatAddressMapper, WeChatAddress> implements IWeChatAddressService {
 
-    private final WeChatAddressMapper weChatAddressMapper;
+	private final WeChatAddressMapper weChatAddressMapper;
 
-    @Override
-    public IPage<WeChatAddress> getPage(WeChatUser weChatUser, IPage<WeChatAddress> page) {
-        return page.setRecords(weChatAddressMapper.getPage(page, weChatUser));
-    }
+	@Override
+	public IPage<WeChatAddress> getPage(WeChatUser weChatUser, IPage<WeChatAddress> page) {
+		return page.setRecords(weChatAddressMapper.getPage(page, weChatUser));
+	}
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean add(WeChatAddress weChatAddress) {
-        weChatAddress.setIsDefault(0);
-//        if (weChatAddress.getIsDefault() == 1) {
-//            WeChatAddress address = this.getOne(Wrappers.<WeChatAddress>lambdaQuery().eq(WeChatAddress::getUserId, weChatAddress.getUserId()).eq(WeChatAddress::getIsDefault, 1));
-//            if (address != null) {
-//                address.setIsDefault(0);
-//                this.updateById(address);
-//            }
-//        }
-        return this.save(weChatAddress);
-    }
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean add(WeChatAddress weChatAddress) {
+		weChatAddress.setIsDefault(0);
+		return this.save(weChatAddress);
+	}
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean edit(WeChatAddress weChatAddress) {
-        if (weChatAddress.getIsDefault() == 1) {
-            WeChatAddress address = this.getOne(Wrappers.<WeChatAddress>lambdaQuery().eq(WeChatAddress::getUserId, weChatAddress.getUserId()).eq(WeChatAddress::getIsDefault, 1));
-            if (address != null && !address.getId().equals(weChatAddress.getId())) {
-                address.setIsDefault(0);
-                this.updateById(address);
-            }
-        }
-        return this.updateById(weChatAddress);
-    }
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean edit(WeChatAddress weChatAddress) {
+		if (Func.isNotEmpty(weChatAddress.getIsDefault()) && weChatAddress.getIsDefault() == 1) {
+			WeChatAddress address = this.getOne(Wrappers.<WeChatAddress>lambdaQuery().eq(WeChatAddress::getUserId, weChatAddress.getUserId()).eq(WeChatAddress::getIsDefault, 1));
+			if (address != null && !address.getId().equals(weChatAddress.getId())) {
+				address.setIsDefault(0);
+				this.updateById(address);
+			}
+		}
+		return this.updateById(weChatAddress);
+	}
 
-    @Override
-    public WeChatAddress getAddress(String phone) {
-        return this.getOne(Wrappers.<WeChatAddress>lambdaQuery().eq(WeChatAddress::getPhone, phone).eq(WeChatAddress::getIsDefault, 1));
-    }
+	@Override
+	public WeChatAddress getAddress(String phone) {
+		return this.getOne(Wrappers.<WeChatAddress>lambdaQuery().eq(WeChatAddress::getPhone, phone).eq(WeChatAddress::getIsDefault, 1));
+	}
 
 }