汇付回调

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java

@@ -330,7 +330,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             // 调用支付
             LinkedMultiValueMap<String, String> httpData = CollectionUtil.linkedMultiValueMapStringString();
             httpData.add("type", "PRODUCT");
-            httpData.add("price", preParam.getPriceActual().toString());
+//            httpData.add("price", preParam.getPriceActual().toString());
+            httpData.add("price","0.01");
             httpData.add("name", preParam.getStoreName());
             httpData.add("detail", preParam.getSkuName());
             httpData.add("orderCode", preParam.getOrderMasterCode());
@@ -433,10 +434,10 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             redisUtils.addUnPayOrder(orderVo.getOrderId());
             //redis 订单列表
             if (noZhengzaiOrder(uid)) {
-                if (orderVo.getMarketType().equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())) {
-                    redisUtils.addZhengzaiOrderList(uid, orderVo.getOrderId());
-                } else {
+                if (orderVo.getMarketType()==null) {
                     redisUtils.addOrderList(uid, orderVo.getOrderId());
+                } else if(orderVo.getMarketType().equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())){
+                    redisUtils.addZhengzaiOrderList(uid, orderVo.getOrderId());
                 }
             }
             //mysql  执行sql