submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -1070,17 +1070,17 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 //底单在新系统 查询新系统订单号
                 Map<String, String> params1 = new HashMap<>();
                 Long nowTime1 = DateUtils.getNowTime();
-                String sign1 = ToolsUtils.EncoderByMd5(nowTime.toString() + "pubilc2022");
+                String sign1 = ToolsUtils.EncoderByMd5(nowTime1.toString() + "pubilc2022");
                 params1.put("stamp", nowTime1.toString());
                 params1.put("sign", sign1);
                 params1.put("orderSn", oldOrder.getOrderSn());
                 String respone1 = "";
                 try {
-                    respone1 = HttpUtils.postFormBody(INPUT_ORDER, params);
-                    if (!respone.contains("\"Status\":true")) {
+                    respone1 = HttpUtils.postFormBody(INPUT_ORDER, params1);
+                    if (!respone1.contains("\"Status\":true")) {
                         throw new CustomException("旧系统查询新系统订单号接口请求错误");
                     }
-                    JSONObject jsonObject = JSONObject.parseObject(respone);
+                    JSONObject jsonObject = JSONObject.parseObject(respone1);
                     Object data = jsonObject.get("Data");
                     if (ObjectUtils.isNull(data)) {
                         //data 为空
@@ -1090,7 +1090,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         updateById(oldOrder);
                     }
                 } catch (IOException e) {
-                    log.error("旧系统查询新系统订单号接口请求错误" + respone);
+                    log.error("旧系统查询新系统订单号接口请求错误" + respone1);
                     throw new CustomException("旧系统查询新系统订单号接口请求错误");
                 }
             }

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -75,16 +75,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="checkStatus != null">
             AND vto.check_status = #{checkStatus}
         </if>
+        <if test="refundStatus != null">
+            AND vto.refund_status = #{refundStatus}
+        </if>
         <if test="refundStatusList != null and refundStatusList.size()!=0 ">
             AND vto.refund_status in
             <foreach collection="refundStatusList" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="creditStatus != null and creditStatus != '' and creditStatus == 0">
+        <if test="creditStatus != null and creditStatus == 0">
             AND vto.order_received <![CDATA[ < ]]> vto.pay_price
         </if>
-        <if test="creditStatus != null and creditStatus != '' and creditStatus == 1">
+        <if test="creditStatus != null and creditStatus == 1">
             AND vto.pay_price = vto.order_received
         </if>
         <if test="invoiceStatus != null and invoiceStatus != ''">