订单消息

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppOrderController.java

@@ -15,6 +15,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import vo.MyRecord;
@@ -111,16 +112,29 @@ public class AppOrderController {
     }
     
     
+//    @GetMapping("/detail")
+//    @ApiOperation(value = "订单获取详情")
+//    public Result<StoreOrderVO> detail(@RequestParam Long id) {
+//        if (id == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//        StoreOrderVO vo = orderServiceBusiness.orderDetail(id,null);
+//        return Result.success(vo);
+//    }
+
     @GetMapping("/detail")
     @ApiOperation(value = "订单获取详情")
-    public Result<StoreOrderVO> detail(@RequestParam Long id) {
-        if (id == null) {
+    public Result<StoreOrderVO> detail(@RequestParam(value = "id", required = false) Long id
+            ,@RequestParam(value = "orderNo", required = false) String orderNo) {
+
+        if (ObjectUtils.isEmpty(id) && ObjectUtils.isEmpty(orderNo) ) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        StoreOrderVO vo = orderServiceBusiness.orderDetail(id,null);
+        StoreOrderVO vo = orderServiceBusiness.orderDetail(id,orderNo);
         return Result.success(vo);
     }
-    
+
+
     @PostMapping("/list")
     @ApiOperation(value = "订单获取列表")
     public Result<List<StoreOrderVO>> list(@RequestBody StoreOrderDTO dto) {

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

@@ -32,6 +32,7 @@ import com.txz.mall.dao.StorePinkMapper;
 import com.txz.mall.dao.StorePinkSummaryMapper;
 import com.txz.mall.dubbo.client.CifAccountDubboServiceClient;
 import com.txz.mall.dubbo.client.CifUserDubboServiceClient;
+import com.txz.mall.enums.NoticeEnum;
 import com.txz.mall.enums.OrderEventsEnum;
 import com.txz.mall.enums.PinkOrderStatusEnum;
 import com.txz.mall.enums.StorePinkStatusEnum;
@@ -621,7 +622,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         // 获取默认地址
         UserAddress userAddress = userAddressService.getDefaultByUid(userId);
         if (ObjectUtil.isNotNull(userAddress)) {
-            // 计算运费
+            // 计算运费/
             getFreightFee(orderInfoVo, userAddress);
             orderInfoVo.setAddressId(userAddress.getId());
             orderInfoVo.setRealName(userAddress.getRealName());
@@ -1766,6 +1767,8 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         return true;
     }
 
+    @Resource
+    private NoticeService noticeService;
 
     //这是由pc端发起端针对个人的主动退款 不是定时任务扫描活动超时导致的退款，所以这个退款是不影响其他拼团成员的。拼团汇总表也不会上锁，拼团状态仍然是进行中
     @Override
@@ -1841,7 +1844,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         // 普通商品口库存
         storeProductService.operationStock(storePink.getPid(), storePink.getTotalNum(), "add");
 
-
+        noticeService.addOrderNotice(NoticeEnum.ORDER_GROUP_BUY_FAIL,storeOrder.getOrderId(),storeOrder.getUid());
 
     }
 
@@ -1892,7 +1895,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
                 //   productAttrValueService.operationStock(skuRecord.getInt("activityAttrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_PINGTUAN);
                 // 普通商品口库存
                 storeProductService.operationStock(storePink.getPid(), storePink.getTotalNum(), "add");
-
+                noticeService.addOrderNotice(NoticeEnum.ORDER_GROUP_BUY_FAIL,storeOrder.getOrderId(),storeOrder.getUid());
 
             } else if (PinkOrderStatusEnum.GROUP_ORDER_PAID.getKey().equals(storeOrder.getStatus())) {
 
@@ -1939,6 +1942,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
                 //   productAttrValueService.operationStock(skuRecord.getInt("activityAttrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_PINGTUAN);
                 // 普通商品口库存
                 storeProductService.operationStock(storePink.getPid(), storePink.getTotalNum(), "add");
+                noticeService.addOrderNotice(NoticeEnum.ORDER_GROUP_BUY_FAIL,storeOrder.getOrderId(),storeOrder.getUid());
 
             } else {
                 throw new ServiceException("当前状态不支持退款关闭:id"+id);
@@ -2038,6 +2042,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         // 普通商品口库存
         storeProductService.operationStock(storePink.getPid(), storePink.getTotalNum(), "add");
 
+        noticeService.addOrderNotice(NoticeEnum.ORDER_GROUP_BUY_FAIL,storeOrder.getOrderId(),storeOrder.getUid());
         //库存数量回退
 
 //        if (storeOrder.getPaid().equals(0)) {

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

@@ -15,6 +15,7 @@ import com.txz.mall.core.AbstractService;
 import com.txz.mall.core.ServiceException;
 import com.txz.mall.dao.StorePinkMapper;
 import com.txz.mall.dubbo.client.CifAccountDubboServiceClient;
+import com.txz.mall.enums.NoticeEnum;
 import com.txz.mall.enums.OrderEventsEnum;
 import com.txz.mall.dubbo.client.CifUserDubboServiceClient;
 import com.txz.mall.enums.PinkOrderStatusEnum;
@@ -26,6 +27,7 @@ import com.txz.mall.service.*;
 import com.txz.mall.util.OrderStateMachine;
 import com.txz.mall.util.RandomUtil;
 import com.txz.mall.web.vo.ProductCarouselVO;
+import dto.NoticeDTO;
 import dto.ProductCarouselDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
@@ -58,6 +60,8 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
 
     @Resource
     private CifUserDubboServiceClient userDubboServiceClient;
+    @Resource
+    private NoticeService noticeService;
 
     @Override
     public List<StorePink> getListByCidAndKid(Long cid, Long kid) {
@@ -95,6 +99,8 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
         update(storePink2);
 
         storeOrderStatusService.createLog(storeOrder.getId(), Constants.ORDER_LOG_PAY_SUCCESS, "支付成功");
+        noticeService.addOrderNotice(NoticeEnum.ORDER_GROUP_BUY_PAYMENT_SUCCESS,storeOrder.getOrderId(),storeOrder.getUid());
+
         memberList.add(teamPink);
 //        memberList.forEach(i -> {
 //            i.setStatus(2);
@@ -223,7 +229,7 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
             storeOrderService.updateOrderStatus(storePink.getOrderIdKey(),pinkOrderStatusEnum.getKey());
 
             storeOrderStatusService.createLog(storeOrder.getId(), Constants.ORDER_STATUS_PINK_SUCCESS_ORDER, "拼团成功");
-
+            noticeService.addOrderNotice(NoticeEnum.ORDER_GROUP_BUY_SUCCESS_WIN,storeOrder.getOrderId(),storeOrder.getUid());
             //中奖者
             param.setWinnerOrderNo(storeOrder.getOrderId());
             param.setWinnerUserId(storeOrder.getUid());
@@ -261,6 +267,8 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
 
             storeOrderService.updateOrderStatus(a.getOrderIdKey(),pinkOrderStatusEnum.getKey());
             storeOrderStatusService.createLog(storeOrder.getId(), Constants.ORDER_STATUS_PINK_SUCCESS_ORDER, "拼团成功");
+            noticeService.addOrderNotice(NoticeEnum.ORDER_GROUP_BUY_SUCCESS_LOSE,storeOrder.getOrderId(),storeOrder.getUid());
+
             //库存回退
             // 拼团商品扣库存
             log.info("storeCombinationService.operationStock"+JSONObject.toJSONString(a));