From 7f09e4bbf1cb3df2ad4fef91a5b2c3401cd01b55 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Fri, 6 Jan 2023 09:35:04 +0800
Subject: [PATCH] Merge branch 'dev_yy' into 2.0-dev
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* dev_yy: (25 commits)
  提交代理商
  1
  1
  提交实物
  提交代码
  提交代码
  提交代码
  提交抽奖代码
  1
  提交代码
  提交代码
  提交代码
  提交代码
  提交代码
  提交
  1
  1
  修改首页没有积分专区
  提交代码
  修改小程序注册用券
  ...

# Conflicts:
#	hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
#	hai-service/src/main/java/com/hai/common/utils/DateUtil.java
#	hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
#	hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
#	hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
#	hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
#	hai-service/src/main/java/com/hai/entity/HighChildOrder.java
#	hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
#	hai-service/src/main/java/com/hai/entity/HighOrder.java
#	hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
#	hai-service/src/main/java/com/hai/service/HighUserService.java
#	hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
#	hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
#	hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
#	hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
---
 .../controller/pay/UnionPayController.java    | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java
index 67707609..85e1b559 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java
@@ -370,6 +370,32 @@ public class UnionPayController {
                             if (highChildOrder.getGoodsType() == 4 || highChildOrder.getGoodsType() == 9) {
                                 highChildOrder.setChildOrdeStatus(2);
                             }
+                            if (highChildOrder.getGoodsType() == 7) {
+                                highChildOrder.setChildOrdeStatus(2);
+                                HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderId(highChildOrder.getId());
+                                if (actual != null) {
+                                    List<HighDiscountPackageDiscountActual> discountList = discountPackageDiscountActualService.getHighDiscountPackageDiscountActualList(actual.getId());
+                                    for (HighDiscountPackageDiscountActual discount : discountList) {
+                                        highDiscountUserRelService.receiveDiscount(order.getMemId(), discount.getAgentDiscountCodeId());
+                                    }
+                                    HighDiscountPackage discountPackage = discountPackageService.findDiscountPackageById(actual.getDiscountPackageId());
+                                    HighDiscountPackageRecord record = new HighDiscountPackageRecord();
+                                    record.setDiscountPackageId(discountPackage.getId());
+                                    record.setDiscountPackageTitle(discountPackage.getTitle());
+                                    record.setUsingAttribution(discountPackage.getUsingAttribution());
+                                    record.setCompanyId(discountPackage.getCompanyId());
+                                    record.setOrderId(order.getId().intValue());
+                                    record.setChildOrderId(highChildOrder.getId().intValue());
+                                    record.setRecordNo(System.currentTimeMillis()+"");
+                                    record.setSalesType(1);
+                                    record.setPrice(order.getPayPrice());
+                                    record.setUserId(order.getMemId().intValue());
+                                    discountPackageRecordService.insertRecord(record);
+                                    actual.setAllocationTime(new Date());
+                                    actual.setStatus(3);  // 状态： 1: 待分配 2:预分配（售卖）3:已分配
+                                    discountPackageActualService.updateHighDiscountPackageActual(actual);
+                                }
+                            }
                         }
 
                         HighGasOrderPush orderPush = new HighGasOrderPush();