订单地址

mall-service/src/main/java/com/txz/mall/business/impl/OrderServiceBusinessImpl.java

@@ -6,6 +6,7 @@ import com.txz.mall.dubbo.client.CifUserDubboServiceClient;
 import com.txz.mall.model.StoreOrder;
 import com.txz.mall.model.StoreOrderInfo;
 import com.txz.mall.model.StoreOrderStatus;
+import com.txz.mall.model.UserAddress;
 import com.txz.mall.service.StoreOrderInfoService;
 import com.txz.mall.service.StoreOrderService;
 import com.txz.mall.service.StoreOrderStatusService;
@@ -40,15 +41,15 @@ public class OrderServiceBusinessImpl implements OrderServiceBusiness {
         Condition infoCondition = new Condition(StoreOrderInfo.class);
         Example.Criteria infoCriteria = infoCondition.createCriteria();
         infoCriteria.andEqualTo("isDelete", 0);
-        infoCriteria.andEqualTo("orderId", storeOrder.getOrderId());
+        infoCriteria.andEqualTo("orderId", storeOrder.getId());
         List<StoreOrderInfo> infoList = storeOrderInfoService.findByCondition(infoCondition);
         List<StoreOrderStatus> logList = storeOrderStatusService.getLogList(storeOrder.getId());
         UserDTO user = userDubboServiceClient.getUser(storeOrder.getUid());
-//        UserAddress userAddress = userAddressService.getDefaultByUid(storeOrder.getUid());
+        UserAddress userAddress = userAddressService.getDefaultByUid(storeOrder.getUid());
         StoreOrderVO vo = new StoreOrderVO();
         BeanUtils.copyProperties(storeOrder, vo);
         vo.setOrderInfoVO(infoList);
-//        vo.setOrderAddressVO(userAddress);
+        vo.setOrderAddressVO(userAddress);
         vo.setOrderStatusVO(logList);
         vo.setUserVO(user);
         return vo;

mall-service/src/main/java/com/txz/mall/controller/UserAddressController.java

@@ -49,8 +49,9 @@ public class UserAddressController {
             if (orderId != null) {
                 StoreOrder storeOrder = new StoreOrder();
                 storeOrder.setId(orderId);
-                storeOrder.setRealName(userAddress.getRealName());
-                storeOrder.setUserPhone(userAddress.getPhone());
+                // 订单跟用户绑定
+//                storeOrder.setRealName(userAddress.getRealName());
+//                storeOrder.setUserPhone(userAddress.getPhone());
                 String userAddressStr = userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getDetail();
                 storeOrder.setUserAddress(userAddressStr);
                 storeOrderService.update(storeOrder);

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -1079,12 +1079,12 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         String verifyCode = "";
         String userAddressStr = "";
 
-        UserAddress userAddress = userAddressService.getDefaultByUid(user.getId());
-        if (userAddress != null) {
-            request.setRealName(userAddress.getRealName());
-            request.setPhone(userAddress.getPhone());
-            userAddressStr = userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getDetail();
-        }
+//        UserAddress userAddress = userAddressService.getDefaultByUid(user.getId());
+//        if (userAddress != null) {
+//            request.setRealName(userAddress.getRealName());
+//            request.setPhone(userAddress.getPhone());
+//            userAddressStr = userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getDetail();
+//        }
 
         // 计算订单各种价格
         OrderComputedPriceRequest orderComputedPriceRequest = new OrderComputedPriceRequest();
@@ -1135,8 +1135,8 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         StoreOrder storeOrder = new StoreOrder();
         storeOrder.setUid(user.getId());
         storeOrder.setOrderId(orderNo);
-        storeOrder.setRealName(request.getRealName());
-        storeOrder.setUserPhone(request.getPhone());
+        storeOrder.setRealName(user.getName());
+        storeOrder.setUserPhone(user.getPhoneNo());
         storeOrder.setUserAddress(userAddressStr);
         storeOrder.setTotalNum(orderInfoVo.getOrderProNum());
         storeOrder.setCouponId(Optional.ofNullable(request.getCouponId()).orElse(0L));

mall-service/src/main/java/vo/StoreOrderVO.java

@@ -36,4 +36,10 @@ public class StoreOrderVO extends StoreOrder implements Serializable {
     @ApiModelProperty(value = "奖励佣金")
     private BigDecimal brokerage;
 
+    @ApiModelProperty(value = "中奖状态 0-未中奖 1-已中奖")
+    private Integer winStatus;
+
+    @ApiModelProperty(value = "拼团状态 0-未开团 1-开团成功 2-开团失败")
+    private Integer pinkStatus;
+
 }