修复用户信息异常

conf/db.properties

@@ -1,12 +1,13 @@
 # 数据库服务器配置
 type=com.alibaba.druid.pool.DruidDataSource
 druid.driver-class=com.mysql.cj.jdbc.Driver
-#druid.url=jdbc:mysql://10.14.1.197:3306/jiao_api_alpha_x?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+druid.url=jdbc:mysql://10.14.1.197:3306/jiao_api_alpha_x?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-#druid.username=jiao_api_alpha_x
+druid.username=jiao_api_alpha_x
-#druid.password=YcpfGJyJpy6KfYR3
+druid.password=YcpfGJyJpy6KfYR3
-druid.url=jdbc:mysql://localhost:3306/szwhtrans?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#druid.url=jdbc:mysql://localhost:3306/szwhtrans?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-druid.username=root
+#druid.username=root
-druid.password=xc1123
+#druid.password=xc1123
+
 druid.initial-size=10
 druid.max-active=100
 druid.min-idle=10

src/main/java/cn/chjyj/szwh/SzwhApplication.java

@@ -5,11 +5,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.util.TimeZone;
+
 @SpringBootApplication
 @EnableCaching
 public class SzwhApplication {
 
 	public static void main(String[] args) {
+		TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
 		SpringApplication.run(SzwhApplication.class, args);
 	}
 

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

@@ -31,7 +31,6 @@ import java.util.*;
 
 @Service
 @Transactional
-@CacheConfig(cacheNames = "goods")
 public class GoodsServiceImpl implements GoodsService {
     private static Log log = LogFactory.getLog(GoodsServiceImpl.class);
     @Autowired

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

@@ -323,11 +323,13 @@ public class OrderServiceImpl implements OrderService {
                         info.put("metadataFileFormat", odsJson.getString("metadataFileFormat"));
                         // 资源下载地址 ,json 格式
                         String sourceDown = orderGoodsDetailMapper.getOrderGoodsDetailSourceDownload(batchcode, dv.getGoods_islicode());
-                        JSONArray sdownJsonArray = JSONArray.parseArray(sourceDown);
+                        if(sourceDown!=null) {
-                        for (int i = 0; i < sdownJsonArray.size(); i++) {
+                            JSONArray sdownJsonArray = JSONArray.parseArray(sourceDown);
-                            if (sdownJsonArray.getJSONObject(i).getString("islicode").equals(ods.getLinkcode())) {
+                            for (int i = 0; i < sdownJsonArray.size(); i++) {
-                                // 是否已经下载。更新下载状态
+                                if (sdownJsonArray.getJSONObject(i).getString("islicode").equals(ods.getLinkcode())) {
-                                info.put("download_status", sdownJsonArray.getJSONObject(i).getString("status"));
+                                    // 是否已经下载。更新下载状态
+                                    info.put("download_status", sdownJsonArray.getJSONObject(i).getString("status"));
+                                }
                             }
                         }
 
@@ -657,9 +659,9 @@ public class OrderServiceImpl implements OrderService {
                     log.error("未查询到用户信息，下单失败" + userIsli);
                     bretMap.put("msg",errmsg);
                 }
-                String oduid =(String)adumap.get("oduid");
+                Integer oduid =(Integer)adumap.get("oduid");
-                if(StringUtils.isNotEmpty(oduid)){
+                if(oduid!=null){
-                    userId = Integer.valueOf(oduid);
+                    userId = oduid;
                 }
             }
         }
@@ -901,8 +903,8 @@ public class OrderServiceImpl implements OrderService {
 
                 //补充其他元素
                 //retmap.put("close_status", ogd.getCloseStatus());
-                // 查询委托方信息
+                // 查询委托方信息,购买方
-                OrderUser entrUser = orderUserMapper.getUserOrder(ogd.getBatchcode(),ogd.getIslicode());
+                OrderUser entrUser = orderUserMapper.getUserOrder(ogd.getBatchcode(),od.getBuyIslicode());
                 if(entrUser!=null){ //not null
                     odgmap.put("entrust_name",entrUser.getName());
                     odgmap.put("attesttime",entrUser.getAttesttime());
@@ -947,7 +949,32 @@ public class OrderServiceImpl implements OrderService {
                 List<OrderGoodsSource> ogsourceList = orderGoodsSourceMapper.getOrderGoodsSourceList(ogd.getId().toString());
                 List ogsJsonList = new ArrayList();
                 for(OrderGoodsSource innerOgs:ogsourceList){
-                    Map osgsMap = JSONObject.parseObject(JSON.toJSONString(innerOgs));
+                    //Map osgsMap = JSONObject.parseObject(JSON.toJSONString(innerOgs));
+                    Map osgsMap = new LinkedHashMap();
+                    osgsMap.put("servicecode",innerOgs.getServicecode());
+                    osgsMap.put("linkcode",innerOgs.getLinkcode());
+                    osgsMap.put("publisherid",innerOgs.getPublisherid());
+                    osgsMap.put("registrant",innerOgs.getRegistrant());
+                    String rsurl=innerOgs.getResolutionUrl();
+                    osgsMap.put("resolution_url",rsurl==null?"":rsurl);
+                    osgsMap.put("source_type",innerOgs.getSourceType());
+                    osgsMap.put("source_name_type",innerOgs.getSourceNameType());
+                    osgsMap.put("source_name",innerOgs.getSourceName());
+                    osgsMap.put("sourceIdentify",innerOgs.getSourceIdentify());
+                    osgsMap.put("source_fragment",innerOgs.getSourceFragment());
+                    String tartname = innerOgs.getTargetName();
+                    osgsMap.put("target_name",tartname);
+                    osgsMap.put("target_name_type",innerOgs.getTargetNameType());
+                    osgsMap.put("targetIdentify",innerOgs.getTargetIdentify());
+                    osgsMap.put("target_fragment",innerOgs.getTargetFragment());
+                    osgsMap.put("targetFormat",innerOgs.getTargetFormat());
+                    osgsMap.put("source_data",innerOgs.getSourceData());
+                    osgsMap.put("target_data",innerOgs.getTargetData());
+                    osgsMap.put("metadataXml",innerOgs.getMetadataXml());
+                    osgsMap.put("cancellation_reason",innerOgs.getCancellationReason());
+                    osgsMap.put("cancellationtime",innerOgs.getCancellationtime());
+                    osgsMap.put("allocationtime",innerOgs.getAllocationtime());
+                    osgsMap.put("datatype",innerOgs.getDatatype());
                     ogsJsonList.add(osgsMap);
                 }
                 // convert to json
@@ -1001,9 +1028,9 @@ public class OrderServiceImpl implements OrderService {
         if (goodsJsonArray.size() == 1) { // 下单商品只有一个
             JSONObject tmpgjson = goodsJsonArray.getJSONObject(0);
             String goodsIsli = tmpgjson.getString("goods_isli");
+            String tuseYear = tmpgjson.getString("use_years");
             // 检查购物车中是否有该商品
             Map ucar = SzCarUtils.getCar(rkey);
-            String tuseYear = tmpgjson.getString("use_years");
             // 产品在购物车中出现 useyear不能正常传入
             if("undefined".equals(tuseYear)){
                 JSONObject inCarJson = (JSONObject) ucar.get(goodsIsli);
@@ -1022,7 +1049,7 @@ public class OrderServiceImpl implements OrderService {
             //返回订单编号
             batchcode = (String) bmap.get("batchcode");
             // 商品从该用户的购物车移除
-            if (ucar.get(goodsIsli) != null) {
+            if (ucar!=null && ucar.get(goodsIsli) != null) {
                 SzCarUtils.delCart(userIsli, goodsIsli);
             }
         } else {
@@ -1275,7 +1302,7 @@ public class OrderServiceImpl implements OrderService {
         String userjsonDataStr = userjson.getString("data");
         if (StringUtils.isBlank(userjsonDataStr)) {
             rmap.put("error", "未查询到用户信息，下单失败");
-            return rmap;
+            return null;
         }
         // 提取出json中的内容
         JSONObject iuserjson =  JSONObject.parseObject(userjsonDataStr);
@@ -1285,6 +1312,6 @@ public class OrderServiceImpl implements OrderService {
         //
         userId = odu.getId();
         rmap.put("oduid", userId);
-        return null;
+        return rmap;
     }
 }

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

@@ -0,0 +1,17 @@
+package cn.chjyj.szwh;
+
+import cn.chjyj.szwh.utils.SzwhApiUtils;
+import com.alibaba.fastjson2.JSONObject;
+import org.junit.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class UserTest {
+    //测试api用户信息
+    @Test
+    public void apiUser(){
+        String usisli="899998-000000001038-3";
+        JSONObject json = SzwhApiUtils.getApiUser(usisli);
+        System.out.println(json);
+    }
+}