add

src/main/java/com/zfire/jiasm/syncdata/gree/GreeLogic.java

@@ -152,7 +152,8 @@ public class GreeLogic {
 
         forms.put("client_id", Collections.singletonList(clientFileId));
         forms.put("client_secret", Collections.singletonList(clientFileSecert));
-        forms.put("grant_type", Collections.singletonList("client_credentials"));
+        // forms.put("grant_type", Collections.singletonList("client_credentials"));
+        forms.put("realm", Collections.singletonList("gree-shyun"));
         log.info("【获取总部文件token】参数:{}",forms);
         log.info("【获取总部文件 】tokenFileUrl:{}",tokenFileUrl);
         String s = HttpUtils.requestXwww(tokenFileUrl, forms);

src/main/resources/mapper/GetOrderProductMapper.xml

@@ -5,14 +5,14 @@
     <select id="getItfTblAssignMxUpload" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignMxUpload">
         select a.out_id as fa_order_repair_product_id,a.pgmxid,'guangfo' as created_by,
                a.create_time as created_date,'guangfo' as last_modified_by,a.update_time as last_modified_date,
-               a.pgid,c.ref_dict_code as spid,c.ref_dict_name as spmc,d.ref_dict_code as xlid,d.ref_dict_name as xlmc,
+               a.pgid,IFNULL(c.ref_dict_code,'') as spid,IFNULL(c.ref_dict_name,'') as spmc,IFNULL(d.ref_dict_code,'') as xlid,IFNULL(d.ref_dict_name,'') as xlmc,
                (case when e.ref_dict_code > 99999 then 0 else e.ref_dict_code end) as xiid,IFNULL(e.ref_dict_name, '') as ximc,
                0 as jxid,IFNULL(a.product_name, '') as jxmc,
                case when length(a.product_id) >30  then left(a.product_id,30) else IFNULL(a.product_id,'') end as jxno,
                a.buy_time as gmsj,a.create_time as czsj,
-               '' as gzwz,a.fault_reason as gzxx, a.create_by as czren,a.sale_websit as xsdw,
-               a.sale_websit_mobile as xsdwdh,a.service_websit_mobile as fwdwdh,
-               a.remark as beiz,'' as qqlyxh,'' as pinpai,a.price as fee,0 as xxfee,
+               '' as gzwz,IFNULL(a.fault_reason,'') as gzxx, IFNULL(a.create_by,'') as czren,IFNULL(a.sale_websit,'') as xsdw,
+            IFNULL(a.sale_websit_mobile,'') as xsdwdh,a.service_websit_mobile as fwdwdh,
+            IFNULL(a.remark,'') as beiz,'' as qqlyxh,'' as pinpai,IFNULL(a.price,0) as fee,0 as xxfee,
                '' as hsqk,a.num as shul,0 as wxcount,0 as yblength
         from order_product a
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'