删除生态返回缓存重的@type属性

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -36,9 +36,11 @@ import cn.freemud.enums.PayStatus;
 import cn.freemud.enums.QueryOrderStatus;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
+import cn.freemud.redis.RedisCache;
 import cn.freemud.request.wechat.dto.SignMessageBuilder;
 import cn.freemud.service.impl.OrderCommonService;
 import cn.freemud.utils.*;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerWxappConfig;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
@@ -134,6 +136,9 @@ public class OrderAdapter {
     @Autowired
     private RedisTemplate redisTemplate;
 
+    @Autowired
+    private RedisCache redisCache;
+
     /**
      * @param createOrderVo
      * @param shoppingCartGoodsDto
@@ -3236,4 +3241,20 @@ public class OrderAdapter {
         return (cal.getTimeInMillis() - System.currentTimeMillis()) / 1000;
     }
 
+    public List<AssortmentOpenPlatformPartnerWxappConfig> cacheSelectDefaultPage(String wxAppId, String type) {
+        if (!StringUtils.isEmpty(wxAppId) && !StringUtils.isEmpty(type)) {
+            String hashKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_" + wxAppId;
+            Object value = redisCache.hashGet(hashKey, type);
+            JSONArray jsonArray = value != null ? JSONArray.parseArray(value.toString()) : new JSONArray();
+            if(null != jsonArray && jsonArray.size() >0){
+                for(int i=0;i<jsonArray.size();i++){
+                    JSONObject jsonObject = (JSONObject) jsonArray.get(i);
+                    jsonObject.remove("@type");
+                }
+            }
+            return (value != null ? JSONObject.parseArray(jsonArray.toString(), AssortmentOpenPlatformPartnerWxappConfig.class)   : new ArrayList());
+        } else {
+            return new ArrayList();
+        }
+    }
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2953,35 +2953,27 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(responses.getData());
     }
 
-    public List<AssortmentOpenPlatformPartnerWxappConfig> cacheSelectDefaultPage(String wxAppId, String type) {
-        if (!StringUtils.isEmpty(wxAppId) && !StringUtils.isEmpty(type)) {
-            String hashKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_" + wxAppId;
-            Object value = this.redisCache.hashGet(hashKey, type);
-            return (List)(value != null ? JSONArray.parseArray(value.toString(), AssortmentOpenPlatformPartnerWxappConfig.class) : new ArrayList());
-        } else {
-            return new ArrayList();
-        }
-    }
-
     public void updatePickUpGoodNo(CreatePrepayRequestDto createPrepayRequestDto,String appId){
         try {
-            List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = this.cacheSelectDefaultPage(appId, "2");
+            List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = orderAdapter.cacheSelectDefaultPage(appId, "2");
             Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
             AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get("mealCodeRule");
-            String mealCodeRule = refundDeliveryFeeConfig.getAppValue();
-            log.info("prefundDeliveryFeeConfig：mealCodeRule{},{}", refundDeliveryFeeConfig, mealCodeRule);
-            if (!StringUtils.isEmpty(mealCodeRule) && "2".equalsIgnoreCase(mealCodeRule)) {
-                //更新db中的取餐码,生成取餐码
-                OrderModifyRelatingCodeReq relatingCodeReq = new OrderModifyRelatingCodeReq();
-                relatingCodeReq.setOrderCode(createPrepayRequestDto.getProductOrderBean().getOid());
-                relatingCodeReq.setOperator(createPrepayRequestDto.getProductOrderBean().getCreateUser());
-                relatingCodeReq.setPartnerId(createPrepayRequestDto.getProductOrderBean().getCompanyId());
-                relatingCodeReq.setPickUpGoodsNo(orderAdapter.generateTackCode(createPrepayRequestDto.getProductOrderBean().getCompanyId(), createPrepayRequestDto.getProductOrderBean().getShopId()));
-                log.info("====relatingCodeReq：{}",relatingCodeReq);
-                orderCenterSdkService.updatePickUpGoodNo(relatingCodeReq, LogThreadLocal.getTrackingNo());
+            log.info("partnerWxappConfigs：{}", JsonUtil.toJSONString(partnerWxappConfigs));
+            if(null != refundDeliveryFeeConfig) {
+                String mealCodeRule = refundDeliveryFeeConfig.getAppValue();
+                if (!StringUtils.isEmpty(mealCodeRule) && "2".equalsIgnoreCase(mealCodeRule)) {
+                    //更新db中的取餐码,生成取餐码
+                    OrderModifyRelatingCodeReq relatingCodeReq = new OrderModifyRelatingCodeReq();
+                    relatingCodeReq.setOrderCode(createPrepayRequestDto.getFatherOrderBean().getOid());
+                    relatingCodeReq.setOperator(createPrepayRequestDto.getFatherOrderBean().getCreateUser());
+                    relatingCodeReq.setPartnerId(createPrepayRequestDto.getPartnerId());
+                    relatingCodeReq.setPickUpGoodsNo(orderAdapter.generateTackCode(createPrepayRequestDto.getFatherOrderBean().getCompanyId(), createPrepayRequestDto.getFatherOrderBean().getShopId()));
+                    log.info("====relatingCodeReq：{}", relatingCodeReq);
+                    orderCenterSdkService.updatePickUpGoodNo(relatingCodeReq, LogThreadLocal.getTrackingNo());
+                }
             }
         }catch (Exception e){
-            log.error("===更新取餐码失败，createPrepayRequestDto，appId：{},{}--->", JsonUtil.toJSONString(createPrepayRequestDto),appId);
+            log.error("===更新取餐码失败，createPrepayRequestDto,partnerWxappConfigs,appId：{},{},{}--->", e,JsonUtil.toJSONString(createPrepayRequestDto),appId);
         }
     }
 }