盲袋专区下单

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/BlindBoxServiceImpl.java

@@ -201,7 +201,7 @@ public class BlindBoxServiceImpl implements BlindBoxService {
                 StringBuffer stringBuffer = new StringBuffer();
                 if (StringUtils.hasLength(remark)) {
                     for (String code : remark.split(",")) {
-                        stringBuffer.append(code + "号福袋");
+                        stringBuffer.append(code);
                         stringBuffer.append("、");
                         codes.add(code);
                     }
@@ -209,7 +209,7 @@ public class BlindBoxServiceImpl implements BlindBoxService {
                 if (stringBuffer.length() > 0) {
                     stringBuffer.deleteCharAt(stringBuffer.length() - 1);
                 }
-                blindBoxBuyRecordVo.setBoxCodes(stringBuffer.toString());
+                blindBoxBuyRecordVo.setBoxCodes(stringBuffer.toString() + "号福袋");
                 blindBoxBuyRecordVoList.add(blindBoxBuyRecordVo);
             }
 

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -474,6 +474,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 long orderAmount = supplierItem.getDistributionPrice() * dto.getItemNum();
                 //盲盒订单存在优惠活动，特殊处理
                 if (dto.getType() != null && DistributionEnum.DistributionTypeEnum.BLACK_COLLECTION.getCode() == dto.getType()) {
+                    //盲袋订单，盲袋编码在remark字段中
+                    distributionOrder.setRemark(dto.getRemark());
+
                     SellActivityRequestDto sellActivityRequestDto = new SellActivityRequestDto();
                     sellActivityRequestDto.setOrderAmount(orderAmount);
                     //查询优惠活动后的订单价格