Merge branch 'master' of dq/kmall-pt into master

kmall-api/src/main/java/com/kmall/api/api/pingan/ApiPayPinganController.java

@@ -164,7 +164,7 @@ public class ApiPayPinganController extends ApiBaseAction {
 
         } catch (Exception e) {
             e.printStackTrace();
-            updateFailProcessBatch(processRecordEntityList, "下单失败,error=" + e.getMessage());//更新订单流转信息
+//            updateFailProcessBatch(processRecordEntityList, "下单失败,error=" + e.getMessage());//更新订单流转信息
             return toResponsFail("下单失败,error=" + e.getMessage());
         }
     }

kmall-schedule/src/main/java/com/kmall/schedule/service/QzOrderService.java

@@ -728,8 +728,8 @@ public class QzOrderService {
                     orderRaram.put("rate", result.getRate());//汇率
                     qzOrderMapper.updateOrderInfo(orderRaram);
                     Map processParam = new HashMap();
-                    orderRaram.put("payTime", successTime);
-                    orderRaram.put("orderSn", orderSn);
+                    processParam.put("payTime", successTime);
+                    processParam.put("orderSn", orderSn);
                     qzOrderMapper.updateOrderProcessRecord(processParam);
                 } else if (result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_NOTPAY.getItem())) {//订单未支付
                     Map orderRaram = new HashMap();
@@ -800,6 +800,7 @@ public class QzOrderService {
             for (Map map : orderList) {
                 String outNo = MapUtils.getString("merch_order_sn", map);
                 String orderId = MapUtils.getString("order_id", map);
+                String orderSn = MapUtils.getString("order_sn", map);
                 String add_time = MapUtils.getString("add_time", map);
                 Integer number = MapUtils.getInteger("number", map);
                 Integer stockNum = MapUtils.getInteger("stock_num", map);
@@ -827,6 +828,10 @@ public class QzOrderService {
                             orderParam.put("payTime", payOrderDto.getTradeTime());
                             orderParam.put("orderId", orderId);
                             qzOrderMapper.updateOrderInfo(orderParam);
+                            Map processParam = new HashMap();
+                            processParam.put("payTime", payOrderDto.getTradeTime());
+                            processParam.put("orderSn", orderSn);
+                            qzOrderMapper.updateOrderProcessRecord(processParam);
                         } else {
                             Map orderRaram = new HashMap();
                             if (getDateBetween(addTime, nowDate) >= 15) {//订单下单时间超过15分钟直接取消订单