订单支付日志

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

@@ -1709,9 +1709,10 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
             throw new ServiceException("当前状态不支持去支持去支付orderId:" + dto.getOrderId());
         }
 
-
+        log.info("accountDubboServiceClient.getWalletAccount");
         // 检验余额够不够
         Result result = accountDubboServiceClient.getWalletAccount(storeOrder.getUid());
+        log.info("accountDubboServiceClient.getWalletAccount result"+ result);
         if (result.getCode().equals(ResultCode.SUCCESS.getCode())) {
             AccountDTO accountDTO = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), AccountDTO.class);
             if (accountDTO.getBalance().compareTo(storeOrder.getPayPrice()) < 0) {
@@ -1729,29 +1730,37 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
             openParam.setUserId(storeOrder.getUid());
             openParam.setAmount(storeOrder.getPayPrice());
             openParam.setTransTime(new Date());
-            
+            log.info("accountDubboServiceClient.openGroup openParam"+openParam);
             //
             Result result1 = accountDubboServiceClient.openGroup(openParam);
+            log.info("accountDubboServiceClient.openGroup result1"+result1);
             if(!result1.getCode().equals("200")){
                 throw new ServiceException("支付失败"+result1.getMessage());
             }
             updateOrderStatus(storeOrder.getId(), pinkOrderStatusEnum.getKey());
+            log.info("pinkSuccess storeOrder1"+storeOrder);
             storePinkService.pinkSuccess(storeOrder.getPinkId(), storeOrder);
+            log.info("pinkSuccess storeOrder2"+storeOrder);
             // goOpen(dto.getOrderId());
         }
         if ("join".equals(dto.getType())) {
+            log.info("join1");
             JoinParam joinParam = new JoinParam();
             joinParam.setBizId(storeOrder.getId().toString());
             joinParam.setBizNo(storeOrder.getOrderId());
             joinParam.setUserId(storeOrder.getUid());
             joinParam.setAmount(storeOrder.getPayPrice());
             joinParam.setTransTime(new Date());
+            log.info("accountDubboServiceClient.joinGroup1:"+joinParam);
             Result result1 = accountDubboServiceClient.joinGroup(joinParam);
+            log.info("accountDubboServiceClient.joinGroup2 result1:"+result1);
             if(!result1.getCode().equals("200")){
                 throw new ServiceException("支付失败"+result1.getMessage());
             }
             updateOrderStatus(storeOrder.getId(), pinkOrderStatusEnum.getKey());
+            log.info("storePinkService.pinkSuccess1 :"+storeOrder);
             storePinkService.pinkSuccess(storeOrder.getPinkId(), storeOrder);
+            log.info("storePinkService.pinkSuccess2 :"+storeOrder);
             // goPink(dto);
         }
         return true;

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.txz.cif.dto.Result;
 import com.txz.cif.dto.UserDTO;
@@ -103,7 +104,9 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
 
         //理论上在支付环节调用的时候不会出现拼团人数校验异常，所以这块调用这个方法的目的在于维护成团状态。 如果支付环节抛出了
         //拼团校验异常则证明在 add时就有问题，没有挡住异常的拼团数据
+        log.info("storePinkSummaryService.maintainQuantityStatusOfTheStorePinkSummary SpsId"+teamPink.getSpsId());
         Boolean b = storePinkSummaryService.maintainQuantityStatusOfTheStorePinkSummary(teamPink.getSpsId());
+        log.info("storePinkSummaryService.maintainQuantityStatusOfTheStorePinkSummary b"+b);
         if(b){
 
         // 算出天选  同时推进订单状态到 代发货状态/订单关闭状态/未中奖成员退款
@@ -161,6 +164,7 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
 
     @Override
     public void theSelection(Long spsId,Date date) {
+        log.info("theSelection"+spsId);
         // 假设只有1个用户是天选
         long luckNum = 1;
 
@@ -238,7 +242,7 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
         param.setTransTime(date);
         //将所有参团成员的status设置为 已开奖
         list.forEach(a->{
-
+            log.info("forEach a:"+JSONObject.toJSONString(a));
             StoreOrder storeOrder = storeOrderService.findById(a.getOrderIdKey());
             PinkOrderStatusEnum pinkOrderStatusEnum = OrderStateMachine.handleEvent(storeOrder, OrderEventsEnum.GROUP_PURCHASE_NOT_WIN, null);
             if(ObjectUtils.isEmpty(pinkOrderStatusEnum)){
@@ -253,14 +257,18 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
             update(unLuckPink);
 
             //推进订单状态到未中奖关闭状态
+            log.info("storeOrderService.updateOrderStatus"+JSONObject.toJSONString(a));
+
             storeOrderService.updateOrderStatus(a.getOrderIdKey(),pinkOrderStatusEnum.getKey());
             storeOrderStatusService.createLog(storeOrder.getId(), Constants.ORDER_STATUS_PINK_SUCCESS_ORDER, "拼团成功");
             //库存回退
             // 拼团商品扣库存
+            log.info("storeCombinationService.operationStock"+JSONObject.toJSONString(a));
             storeCombinationService.operationStock(a.getCid(), a.getTotalNum(), "add");
             // 拼团商品规格扣库存
             //   productAttrValueService.operationStock(skuRecord.getInt("activityAttrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_PINGTUAN);
             // 普通商品口库存
+            log.info("storeProductService.operationStock"+JSONObject.toJSONString(a));
             storeProductService.operationStock(a.getPid(), a.getTotalNum(), "add");
 
 
@@ -281,10 +289,12 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
             orderParamList.add(orderParam);
 
         });
+        log.info("orderParamList"+orderParamList);
         param.setUserIds(orderParamList);
+        log.info("cifAccountDubboServiceClient.accomplishGroup"+JSONObject.toJSONString(param));
 
         Result result = cifAccountDubboServiceClient.accomplishGroup(param);
-
+        log.info("cifAccountDubboServiceClient.accomplishGroup result"+result);
         if(!result.getCode().equals("200")){
             throw new ServiceException("拼团成团未中奖用户退款失败message:"+result.getMessage());
         }

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

@@ -18,10 +18,7 @@ import com.txz.mall.core.ServiceException;
 import com.txz.mall.dao.MidFavoriteMapper;
 import com.txz.mall.dao.StoreCombinationMapper;
 import com.txz.mall.dao.StoreProductMapper;
-import com.txz.mall.model.ProductAttr;
-import com.txz.mall.model.ProductAttrValue;
-import com.txz.mall.model.StoreOrder;
-import com.txz.mall.model.StoreProduct;
+import com.txz.mall.model.*;
 import com.txz.mall.service.ProductAttrService;
 import com.txz.mall.service.ProductAttrValueService;
 import com.txz.mall.service.StoreProductService;
@@ -157,14 +154,35 @@ public class StoreProductServiceImpl extends AbstractService<StoreProduct> imple
         //            storeProductResponse.setCouponIds(ids);
         //        }
         Long cid = combinationMapper.getIdByProductId(storeProduct.getId());
+        if(!ObjectUtils.isEmpty(cid)) {
+            StoreCombination storeCombination = combinationMapper.selectByPrimaryKey(cid);
+            if(!ObjectUtils.isEmpty(storeCombination)){
+                storeProductResponse.setPeople(storeCombination.getPeople());
+            }
+        }
         storeProductResponse.setCid(cid);
 
         try {
             Long tokenUserId = AuthService.getTokenUserId(null);
-            int favoriteFlag = midFavoriteMapper.getFavoriteFlag(FavoriteDTO.builder().productId(storeProduct.getId()).userId(tokenUserId).build());
-            storeProductResponse.setFavoriteFlag(
-                    (favoriteFlag == 0) ? (Boolean.FALSE) : (Boolean.TRUE)
-            );
+//            int favoriteFlag = midFavoriteMapper.getFavoriteFlag(FavoriteDTO.builder().productId(storeProduct.getId()).userId(tokenUserId).build());
+//            storeProductResponse.setFavoriteFlag(
+//                    (favoriteFlag == 0) ? (Boolean.FALSE) : (Boolean.TRUE)
+//            );
+
+            Byte isValid = 1;
+            Condition conditionMidFavorite = new Condition(MidFavorite.class);
+            Example.Criteria criteriaMidFavorite = conditionMidFavorite.createCriteria();
+            criteriaMidFavorite.andEqualTo("productId",storeProduct.getId());
+            criteriaMidFavorite.andEqualTo("userId",tokenUserId);
+            criteriaMidFavorite.andEqualTo("isValid",isValid);
+            List<MidFavorite> midFavoriteList = midFavoriteMapper.selectByCondition(conditionMidFavorite);
+            if(!CollectionUtils.isEmpty(midFavoriteList)){
+                storeProductResponse.setFavoriteFlag(Boolean.TRUE);
+                storeProductResponse.setFavoriteId(midFavoriteList.get(0).getId());
+            }else{
+                storeProductResponse.setFavoriteFlag(Boolean.FALSE);
+            }
+
         } catch (Exception e) {
 
         }

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

@@ -180,4 +180,9 @@ public class StoreProductInfoVO implements Serializable {
      * 收藏标识
      */
     private Boolean favoriteFlag = Boolean.FALSE;
+
+    /**
+     * @ApiModelProperty(value = "收藏id")
+     */
+    private Long favoriteId;
 }