Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

* 'dev' of http://139.159.177.244:3000/hurui/hai-server:
  提交代码
  提交代码

hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java

@@ -113,7 +113,7 @@ public interface OutRechargeOrderService {
      * 汇联通支付
      * @param orderId
      */
-    void hltUnionCardPay(Long userCardId, Long orderId);
+    void hltUnionCardPay(Long userCardId, Long orderId) throws Exception;
 
     /**
      * 积分支付

hai-service/src/main/java/com/hai/service/impl/HighCouponAgentServiceImpl.java

@@ -429,7 +429,7 @@ public class HighCouponAgentServiceImpl implements HighCouponAgentService {
         }
         HighCouponCode couponCode = codeList.get(0);
         couponCode.setIsAssignAgent(true);
-        couponCode.setAgentId(couponCode.getAgentId());
+        couponCode.setAgentId(convertCode.getAgentId());
         couponCode.setReceiveTime(new Date());
         couponCode.setStatus(2);
         highCouponCodeService.updateCouponCode(couponCode);

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -450,7 +450,7 @@ public class HighOrderServiceImpl implements HighOrderService {
         }
         JSONObject consumptionResult = HuiLianTongUnionCardConfig.resolveResponse(consumption.getString("data"));
         if (consumptionResult.getBoolean("success") != true) {
-            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "交易失败!"+consumptionResult.getString("message"));
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumptionResult.getString("message"));
         }
 
         // 查询用户

hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

@@ -264,8 +264,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
     }
 
     @Override
-    public void hltUnionCardPay(Long userCardId, Long orderId) {
+    public void hltUnionCardPay(Long userCardId, Long orderId) throws Exception {
-        try {
         HighUserCard userCard = highUserCardService.getDetailById(userCardId);
         if(userCard == null) {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到用户绑定的卡号信息");
@@ -309,7 +308,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         }
         JSONObject consumptionResult = HuiLianTongUnionCardConfig.resolveResponse(consumption.getString("data"));
         if (consumptionResult.getBoolean("success") != true) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "交易失败!"+consumptionResult.getString("message"));
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumptionResult.getString("message"));
         }
         order.setPaySerialNo(consumptionResult.getString("orderId")); // 支付流水号
         order.setPayRealPrice(order.getPayPrice()); // 实付金额
@@ -317,9 +316,6 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         order.setPayType(2);
         order.setPayTime(new Date()); // 支付时间
         updateOrder(order);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
     @Override