订单状态in

src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java

@@ -5,6 +5,7 @@ import cn.chjyj.szwh.service.GoodsDetailService;
 import cn.chjyj.szwh.service.GoodsService;
 import cn.chjyj.szwh.service.GoodsSourceService;
 import cn.chjyj.szwh.service.UserService;
+import cn.chjyj.szwh.utils.SzwhApiUtils;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
@@ -151,7 +152,9 @@ public class AdminGoodsController extends BaseController {
         Map gdmap = goodsService.getGoodsDetail(islicode);
         // 授权方信息
         String userIsli = (String)gdmap.get("user_isli");
-        Map userMap = userService.getApiUser(userIsli,token);
+        JSONObject ujson = SzwhApiUtils.getApiUser(userIsli);
+        Map userMap =(Map) JSON.parse(ujson.toString());
+        //Map userMap = userService.getApiUser(userIsli,token);
         gdmap.put("userinfo",userMap);
 
         jsonObject.put("code",200);

src/main/java/cn/chjyj/szwh/controller/api/OrderController.java

@@ -100,7 +100,12 @@ public class OrderController extends BaseController {
         // 订单状态
         String orderStatus = request.getString("order_status");
         if(StringUtils.isNotBlank(orderStatus)){
-            qmap.put("status", orderStatus);
+            if(orderStatus.contains(",")){
+                String[] stuarr = orderStatus.split(",");
+                qmap.put("ordstatus",stuarr);
+            }else {
+                qmap.put("status", orderStatus);
+            }
         }
         //
         String creatimeStr = request.getString("createtime");

src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java

@@ -16,9 +16,7 @@ import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/cn/chjyj/szwh/service/impl/PayServiceImpl.java

@@ -125,11 +125,11 @@ public class PayServiceImpl implements PayService {
                     JSONObject lkcjson = (JSONObject) aparr.get(0);
                     // 返回的值是 buyIslicode 为键名的内容
                     contractcode = lkcjson.getString(buyIslicode);
+                    //合约关联编号，更新到订单商品详情中
+                    Map ogdmap = new HashMap();
+                    ogdmap.put("contract_code", contractcode);
+                    orderGoodsDetailMapper.updateOrderGoodsDetail(ogdmap, odgd.getId());
                 }
-                //合约关联编号，更新到订单商品详情中
-                Map ogdmap = new HashMap();
-                ogdmap.put("contract_code", contractcode);
-                orderGoodsDetailMapper.updateOrderGoodsDetail(ogdmap, odgd.getId());
             } else {
                 contractcode = odgd.getContractCode();
             }

src/main/resources/application.properties

@@ -38,7 +38,7 @@ server.compression.mime-types=application/json,application/xml,text/html,text/xm
 spring.quartz.scheduler-name=szwhQuartz
 spring.quartz.job-store-type=memory
 # quartz 自动启动
-spring.quartz.auto-startup=true
+spring.quartz.auto-startup=false
 # 延迟5s启动
 spring.quartz.startup-delay=5
 # 应用关闭时候等待完成

src/main/resources/mapper/szwh/OrderMapper.xml

@@ -68,7 +68,7 @@
                 <!-- 查询条件封装在map中，以k-v形式进行查询-->
                 <foreach collection="map" item="v" index="k" separator="and">
                     <if test="v != null and v != '' and k!='id' and k!='charges_type'
-                    and k!='buyin' and k!='bcin' and k!='name' and k!='createtime'
+                    and k!='buyin' and k!='bcin' and k!='name' and k!='createtime' and k!='ordstatus'
                     and k!='goods_name' and k!='goods_entrust' and k!='paymenttime'">
                         ${k} = #{v}
                     </if>
@@ -84,6 +84,10 @@
                     <if test="k=='name'">
                         `name` like concat('%',#{v},'%')
                     </if>
+                    <!-- 訂單狀態 -->
+                    <if test="k=='ordstatus'">
+                        status in (${v})
+                    </if>
                     <if test="k=='bcin' and v!=null">
                         batchcode in
                         <foreach item="btcode" index="index" collection="v" open="(" separator="," close=")">

src/test/java/cn/chjyj/szwh/UserTest.java

@@ -1,10 +1,12 @@
 package cn.chjyj.szwh;
 
+import cn.chjyj.szwh.utils.SignUtils;
 import cn.chjyj.szwh.utils.SzwhApiUtils;
 import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
 
 @SpringBootTest
 public class UserTest {
@@ -29,4 +31,11 @@ public class UserTest {
         System.out.println(auth);
         //System.out.println(ijson.getString("authorization"));
     }
+
+    @Test
+    public void tktest(){
+        //String token = SignUtils.createSign("apply");
+        String token =  SignUtils.createSign("user_real");
+        System.out.println(token);
+    }
 }