提交代码

hai-order/src/main/java/com/web/controller/OrderRefundController.java

@@ -157,6 +157,7 @@ public class OrderRefundController {
     @ApiOperation(value = "获取退款列表")
     public ResponseData getRefundList(@RequestParam(name = "orderNo", required = false) String orderNo,
                                       @RequestParam(name = "orderChildNo", required = false) String orderChildNo,
+                                      @RequestParam(name = "refundOrderNo", required = false) String refundOrderNo,
                                       @RequestParam(name = "memPhone", required = false) String memPhone,
                                       @RequestParam(name = "goodsType", required = false) Integer goodsType,
                                       @RequestParam(name = "status", required = false) Integer status,

hai-service/src/main/java/com/hai/config/HuiLianTongUnionCardConfig.java

@@ -190,7 +190,6 @@ public class HuiLianTongUnionCardConfig {
         dataMap.put("instCode", instCode);
         dataMap.put("goodsDesc", goodsDesc);
         dataMap.put("tranDesc", tranDesc);
-        System.out.println("工会卡支付请求参数" + JSON.toJSONString(dataMap));
         return request("qtk/consumption", dataMap);
     }
 
@@ -308,7 +307,7 @@ public class HuiLianTongUnionCardConfig {
 
     public static void main(String[] args) {
 
-        String data = "T3xbPEKEXV+WYFZGgpCAIkf48/BkSo8RybQf7BpKvU4ul+a1IN29PI/qyrjYOYVw1rfA6vXK8Sht\\nqCeY6UVqUpci+xsG0+1chVRakKluFTZL73B93yy9gV7AVOOJpUeMILav5N53NeOPQtYf8Boxg/Fz\\nTIW0BtuR".replace("\\n", "");
+        String data = "T3xbPEKEXV9+CbBw8D1B+N2jk8xwa55s0Bde48c49YDwYfnUdBVz6Kj4HS2oCA1TTiqJkCUIYa4G\\nnKXcKOzlf7gwVpP6h5gK1tT3xUQd1iW9VOjF0iOn9bVuWzUqlPb+6YhgCjwVIWvutzGr07fQX1jV\\n4jlRdiZVaq3frwd8SuG5KRlWTHXXTnshDIoO4DyR5P7HfF3W3m4=".replace("\\n", "");
         String decodeData = DesUtil.decode("F8E91A3C", data, Charset.forName("UTF-8"));
         System.out.println(JSONObject.parseObject(decodeData));
 

hai-service/src/main/java/com/hai/dao/HighCouponCodeMapperExt.java

@@ -109,7 +109,7 @@ public interface HighCouponCodeMapperExt {
      * @param couponId
      * @return
      */
-    @Select("SELECT * FROM high_coupon_code where coupon_id = 23423608 and is_assign_agent = false and status = 1 and sales_end_time > now()" +
+    @Select("SELECT * FROM high_coupon_code where coupon_id = #{couponId} and is_assign_agent = false and status = 1 and sales_end_time > now()" +
             "ORDER BY sales_end_time asc LIMIT 1")
     @Results({
             @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),

hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java

@@ -96,7 +96,7 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
     public HighOrder orderPaySuccessHandle(String orderNo, OrderPayType payType, String paySerialNo, BigDecimal payRealPrice, HighUserCard userCard) {
         HighOrder order = orderService.getOrderDetailByNo(orderNo);
         try {
-            if (order != null && order.getOrderStatus().equals(OrderStatus.STATUS2.getNumber())) {
+            if (order != null && order.getOrderStatus().equals(OrderStatus.STATUS1.getNumber())) {
                 order.setPaySerialNo(paySerialNo);
                 order.setPayRealPrice(payRealPrice);
                 order.setPayTime(new Date());
@@ -131,7 +131,7 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
                 order.setExceptionContent(e.getMessage());
                 orderService.updateOrderData(order);
             }
-            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, e.getMessage());
+            return order;
         }
     }
 
@@ -141,9 +141,9 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
      * @throws Exception
      */
     @Transactional(
-            propagation= Propagation.REQUIRES_NEW,
+            propagation= Propagation.REQUIRED,
             isolation = Isolation.READ_COMMITTED,
-            timeout = 10,
+            timeout = 20,
             rollbackFor = Exception.class)
     public void orderBusHandle(HighOrder order) throws Exception {
         for (HighChildOrder childOrder : order.getHighChildOrderList()) {