|
@@ -2,11 +2,13 @@ package com.caimei.service.order.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.caimei.entity.*;
|
|
|
+import com.caimei.mapper.order.BpUserInfoMapper;
|
|
|
import com.caimei.mapper.order.CmShopOrderMapper;
|
|
|
import com.caimei.mapper.order.OrderMapper;
|
|
|
import com.caimei.mapper.order.OrderProductMapper;
|
|
|
import com.caimei.mapper.products.HomePageMapper;
|
|
|
import com.caimei.mapper.products.OrganizeProductsMapper;
|
|
|
+import com.caimei.mapper.user.AddressMapper;
|
|
|
import com.caimei.mapper.user.LoginMapper;
|
|
|
import com.caimei.mapper.user.PersonalMapper;
|
|
|
import com.caimei.mapper.user.UserMapper;
|
|
@@ -49,6 +51,10 @@ public class OrderServiceImpl implements OrderService {
|
|
|
private CmShopOrderMapper cmShopOrderMapper;
|
|
|
@Autowired
|
|
|
private HomePageMapper homePageMapper;
|
|
|
+ @Autowired
|
|
|
+ private BpUserInfoMapper bpUserInfoMapper;
|
|
|
+ @Autowired
|
|
|
+ private AddressMapper addressMapper;
|
|
|
|
|
|
@Value("${miniprogram.domain}")
|
|
|
private String domain;
|
|
@@ -412,7 +418,7 @@ public class OrderServiceImpl implements OrderService {
|
|
|
|
|
|
/**判断前端传入orderShouldPayFee订单应付金额,和后台计算应付金额对比*/
|
|
|
double v = payableAmount.subtract(new BigDecimal(orderShouldPayFee)).doubleValue();
|
|
|
- if (v > -0.1d || v < 0.1d) {
|
|
|
+ if (v < -0.1d || v > 0.1d) {//考虑前端计算不精确
|
|
|
return wxJsonModel.error("-1", "订单付款金额异常");
|
|
|
}
|
|
|
|
|
@@ -583,15 +589,40 @@ public class OrderServiceImpl implements OrderService {
|
|
|
cmOrder.setShopOrderIDs(shopOrderIDs);//子订单ID:1000,1002
|
|
|
orderMapper.update(cmOrder);
|
|
|
|
|
|
- //保存地址信息
|
|
|
+ //获取地址信息
|
|
|
+ Address address = addressMapper.findByAddressID(addressID);
|
|
|
+ if(null != address){
|
|
|
+ //保存地址信息
|
|
|
+ BpOrderUserInfo bpOrderUserInfo = new BpOrderUserInfo();
|
|
|
+ bpOrderUserInfo.setOrderId(orderID);
|
|
|
+ bpOrderUserInfo.setClubId(clubID);
|
|
|
+ bpOrderUserInfo.setUserId(userId);
|
|
|
+ bpOrderUserInfo.setName(user.getUserName());
|
|
|
+ bpOrderUserInfo.setShouHuoRen(address.getShouHuoRen());
|
|
|
+ bpOrderUserInfo.setMobile(address.getMobile());
|
|
|
+ bpOrderUserInfo.setPostalCode(address.getPhone());
|
|
|
+ bpOrderUserInfo.setPostalCode(address.getPostalCode());
|
|
|
+ bpOrderUserInfo.setTownId(address.getTownID());
|
|
|
+ bpOrderUserInfo.setProvince(address.getProvince());
|
|
|
+ bpOrderUserInfo.setCity(address.getCity());
|
|
|
+ bpOrderUserInfo.setTown(address.getTown());
|
|
|
+ bpOrderUserInfo.setAddress(address.getAddressDetail());
|
|
|
+ bpUserInfoMapper.insertUserInfo(bpOrderUserInfo);
|
|
|
+ }else{
|
|
|
+ return wxJsonModel.error("订单地址异常");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ //保存发票信息(发票采用不可选,只要用户存在增值税发票则保存最新记录即可)
|
|
|
|
|
|
- //保存发票信息
|
|
|
|
|
|
//提交订单完成后清理购物车(用户ID,商品ID)
|
|
|
if (StringUtils.equals("1", cartType)) {//购物车提交后清理购物车
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ /**构造返回参数*/
|
|
|
Map<String, String> info = new HashMap<>();
|
|
|
info.put("orderID", String.valueOf(cmOrder.getOrderID()));
|
|
|
info.put("orderNo", String.valueOf(cmOrder.getOrderNo()));
|