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

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -85,6 +85,10 @@
         select sum(a.actual_price) 'totalActualPrice' from mall_order a where merch_order_sn = #{merchOrderSn}
     </select>
 
+    <select id="queryObjectByMerchOrderSn" resultType="com.kmall.admin.entity.OrderEntity">
+        select * from mall_order a where merch_order_sn = #{merchOrderSn}
+    </select>
+
     <select id="queryList" resultType="com.kmall.admin.entity.OrderEntity">
         SELECT
         o.*,

kmall-admin/src/main/resources/mybatis/mapper/OrderRefundDao.xml

@@ -73,7 +73,8 @@
         o.goods_price,
         o.add_time,
         u.username AS username,
-        s.username AS approver
+        s.username AS approver,
+        o.is_onffline_order isOnfflineOrder
         FROM mall_order_refund r
         LEFT JOIN mall_order o ON r.order_id = o.id
         LEFT JOIN mall_user u ON o.user_id = u.id
@@ -90,7 +91,8 @@
         o.order_price,
         o.goods_price,
         o.add_time,
-        u.username as username
+        u.username as username,
+        o.is_onffline_order isOnfflineOrder
         from mall_order_refund r
         left join mall_order o on r.order_id = o.id
         left join mall_user u on o.user_id = u.id
@@ -203,6 +205,7 @@
 			`approver`,
 			`approval_time`,
 			`approval_remark`,
+			create_time,
 			`out_refund_no`)
 		values(
 			#{orderId},
@@ -224,6 +227,7 @@
 			#{approver},
 			#{approvalTime},
 			#{approvalRemark},
+			#{createTime},
 			#{outRefundNo})
 	</insert>
 
@@ -250,6 +254,7 @@
             <if test="approvalTime != null">`approval_time` = #{approvalTime},</if>
             <if test="approvalRemark != null">`approval_remark` = #{approvalRemark},</if>
             <if test="outRefundNo != null">`out_refund_no` = #{outRefundNo},</if>
+            <if test="modTime != null">`mod_time` = #{modTime},</if>
         </set>
         where id = #{id}
     </update>

kmall-api/src/main/java/com/kmall/api/api/ApiPayController.java

@@ -156,7 +156,7 @@ public class ApiPayController extends ApiBaseAction {
             String return_msg = MapUtils.getString("return_msg", resultUn);
             //
             if (return_code.equalsIgnoreCase("FAIL")) {
-                updateFailProcessBatch(processRecordEntityList, "支付失败," +return_msg);//更新订单流转信息
+//                updateFailProcessBatch(processRecordEntityList, "支付失败," +return_msg);//更新订单流转信息
                 addOrderExceptionRecord(orderVoList, Dict.exceptionStatus.item_00.getItem(),"支付失败," +return_msg);//记录订单异常信息
                 return toResponsFail("支付失败," + return_msg);
             } else if (return_code.equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
@@ -164,7 +164,7 @@ public class ApiPayController extends ApiBaseAction {
                 String result_code = MapUtils.getString("result_code", resultUn);
                 String err_code_des = MapUtils.getString("err_code_des", resultUn);
                 if (result_code.equalsIgnoreCase("FAIL")) {
-                    updateFailProcessBatch(processRecordEntityList, "支付失败," +err_code_des);//更新订单流转信息
+//                    updateFailProcessBatch(processRecordEntityList, "支付失败," +err_code_des);//更新订单流转信息
                     addOrderExceptionRecord(orderVoList, Dict.exceptionStatus.item_00.getItem(),"支付失败," +err_code_des);//记录订单异常信息
                     return toResponsFail("支付失败," + err_code_des);
                 } else if (result_code.equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
@@ -175,24 +175,24 @@ public class ApiPayController extends ApiBaseAction {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            updateFailProcessBatch(processRecordEntityList, "下单失败,error=" + e.getMessage());//更新订单流转信息
+//            updateFailProcessBatch(processRecordEntityList, "下单失败,error=" + e.getMessage());//更新订单流转信息
             return toResponsFail("下单失败,error=" + e.getMessage());
         }
         return toResponsFail("下单失败");
     }
 
-    /**
-     * 更新订单支付失败流转信息
-     * @param processRecordEntityList
-     * @param return_msg
-     */
-    public void updateFailProcessBatch(List<OrderProcessRecordEntity> processRecordEntityList,String return_msg){
-        for (OrderProcessRecordEntity orderProcessRecordEntity : processRecordEntityList) {
-            orderProcessRecordEntity.setIsPaymentSend(Dict.isSend.item_0.getItem());
-            orderProcessRecordEntity.setProcessContent(return_msg);
-        }
-        orderProcessRecordService.updateBatch(processRecordEntityList);
-    }
+//    /**
+//     * 更新订单支付失败流转信息
+//     * @param processRecordEntityList
+//     * @param return_msg
+//     */
+//    public void updateFailProcessBatch(List<OrderProcessRecordEntity> processRecordEntityList,String return_msg){
+//        for (OrderProcessRecordEntity orderProcessRecordEntity : processRecordEntityList) {
+//            orderProcessRecordEntity.setIsPaymentSend(Dict.isSend.item_0.getItem());
+//            orderProcessRecordEntity.setProcessContent(return_msg);
+//        }
+//        orderProcessRecordService.updateBatch(processRecordEntityList);
+//    }
 
     /**
      * 记录订单异常信息

kmall-api/src/main/java/com/kmall/api/api/wxGlobal/ApiWxGlobalPayController.java

@@ -123,7 +123,7 @@ public class ApiWxGlobalPayController extends ApiBaseAction {
             String return_msg = queryApiResult.getReturn_msg();
             //
             if (return_code.equalsIgnoreCase("FAIL")) {
-                updateFailProcessBatch(processRecordEntityList, "支付失败 ," +return_msg);//更新订单流转信息
+//                updateFailProcessBatch(processRecordEntityList, "支付失败 ," +return_msg);//更新订单流转信息
                 addOrderExceptionRecord(orderVoList, Dict.exceptionStatus.item_00.getItem(),"支付失败 ," +return_msg);//记录订单异常信息
                 return toResponsFail("支付失败 ," + return_msg);
             } else if (return_code.equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
@@ -131,7 +131,7 @@ public class ApiWxGlobalPayController extends ApiBaseAction {
                 String result_code = queryApiResult.getResult_code();
                 String err_code_des = queryApiResult.getErr_code_des();
                 if (result_code.equalsIgnoreCase("FAIL")) {
-                    updateFailProcessBatch(processRecordEntityList, "支付失败 ," +err_code_des);//更新订单流转信息
+//                    updateFailProcessBatch(processRecordEntityList, "支付失败 ," +err_code_des);//更新订单流转信息
                     addOrderExceptionRecord(orderVoList, Dict.exceptionStatus.item_00.getItem(),"支付失败 ," +err_code_des);//记录订单异常信息
                     return toResponsFail("支付失败 ," + err_code_des);
                 } else if (result_code.equalsIgnoreCase(WechatGlobalUtil.WXTradeState.SUCCESS.getCode())) {
@@ -142,24 +142,24 @@ public class ApiWxGlobalPayController extends ApiBaseAction {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            updateFailProcessBatch(processRecordEntityList, "下单失败,error=" + e.getMessage());//更新订单流转信息
+//            updateFailProcessBatch(processRecordEntityList, "下单失败,error=" + e.getMessage());//更新订单流转信息
             return toResponsFail("下单失败,error=" + e.getMessage());
         }
         return toResponsFail("下单失败");
     }
 
-    /**
-     * 更新订单支付失败流转信息
-     * @param processRecordEntityList
-     * @param return_msg
-     */
-    public void updateFailProcessBatch(List<OrderProcessRecordEntity> processRecordEntityList,String return_msg){
-        for (OrderProcessRecordEntity orderProcessRecordEntity : processRecordEntityList) {
-            orderProcessRecordEntity.setIsPaymentSend(Dict.isSend.item_0.getItem());
-            orderProcessRecordEntity.setProcessContent(return_msg);
-        }
-        orderProcessRecordService.updateBatch(processRecordEntityList);
-    }
+//    /**
+//     * 更新订单支付失败流转信息
+//     * @param processRecordEntityList
+//     * @param return_msg
+//     */
+//    public void updateFailProcessBatch(List<OrderProcessRecordEntity> processRecordEntityList,String return_msg){
+//        for (OrderProcessRecordEntity orderProcessRecordEntity : processRecordEntityList) {
+//            orderProcessRecordEntity.setIsPaymentSend(Dict.isSend.item_0.getItem());
+//            orderProcessRecordEntity.setProcessContent(return_msg);
+//        }
+//        orderProcessRecordService.updateBatch(processRecordEntityList);
+//    }
 
     /**
      * 记录订单异常信息

kmall-api/src/main/java/com/kmall/api/service/ApiPayService.java

@@ -149,7 +149,6 @@ public class ApiPayService {
                         entity.setUserId(Integer.valueOf(orderInfo.getUser_id()+""));
                         entity.setId(processRecordEntity.getId());
                         entity.setPaySuccTime(timeEnd);//微信下单完成时间
-                        entity.setIsPaymentSend(Dict.isSend.item_1.getItem());
                         processRecordEntityList.add(entity);
                     }
 

kmall-api/src/main/java/com/kmall/api/service/wxGlobal/ApiWxGlobalPayService.java

@@ -132,9 +132,8 @@ public class ApiWxGlobalPayService {
                         OrderProcessRecordEntity entity = new OrderProcessRecordEntity();
                         entity.setOrderSn(orderInfo.getOrder_sn());
                         entity.setUserId(Integer.valueOf(orderInfo.getUser_id()+""));
-                        entity.setId(processRecordEntity.getId());
-                        entity.setIsPaymentSend(Dict.isSend.item_1.getItem());
                         entity.setPaySuccTime(timeEnd);//微信下单完成时间
+                        entity.setId(processRecordEntity.getId());
                         processRecordEntityList.add(entity);
                     }
 

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

@@ -634,8 +634,8 @@ public class QzOrderService {
                     orderRaram.put("orderId", orderId);
                     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();