1

hai-cweb/src/main/java/com/cweb/controller/Goods/GoodsController.java

@@ -158,6 +158,8 @@ public class GoodsController {
                 goodsModel.setOriginalPrice(minOriginalPrice);
                 goodsModel.setPrice(minPrice);
                 goodsModel.setWhetherMultiple(goodsSku.size() != 1);
+                goodsModel.setGoodsSkus(goodsSku);
+
 
             }
 

hai-cweb/src/main/java/com/cweb/controller/HighGasController.java

@@ -461,7 +461,7 @@ public class HighGasController {
                     JSONObject data = JSONObject.parseObject(JSONObject.toJSONString(object.get(0)));
                     JSONObject result = new JSONObject();
 
-                    result.put("gasLogoSmall" , data.getString("tupian"));
+                    result.put("gasLogoSmall" , store.getStoreLogo());
                     result.put("gasAddress" , data.getString("dizhi"));
                     result.put("gasName" , data.getString("mingcheng"));
                     result.put("gasAddress" , data.getString("dizhi"));

hai-order/src/main/java/com/web/config/AuthConfig.java

@@ -94,6 +94,7 @@ public class AuthConfig implements WebMvcConfigurer {
 	      .excludePathPatterns("/mobileRechargeNotify/*")
 	      .excludePathPatterns("/payNotify/*")
 	      .excludePathPatterns("/telChargeCallback/*")
+	      .excludePathPatterns("/huiPayNotify/*")
 	      ;
 	  }
 

hai-order/src/main/java/com/web/controller/business/GoodsOrderController.java

@@ -111,6 +111,10 @@ public class GoodsOrderController {
             } else {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, "");
             }
+            if (userInfoModel.getBsCompany().getId() == 3) {
+                map.put("promoteCode", "gzhlt");
+                map.put("companyId" , null);
+            }
             map.put("createTimeS", createTimeS);
             map.put("createTimeE", createTimeE);
             map.put("payTimeS", payTimeS);

hai-order/src/main/java/com/web/controller/business/OrderThirdPartyController.java

@@ -193,7 +193,7 @@ public class OrderThirdPartyController {
                 model.setDeductionProductPrice(thirdPartyModel.getDeductionProductPrice());
                 model.setPayablePrice(thirdPartyModel.getPayablePrice());
                 model.setPayPrice(thirdPartyModel.getPayPrice());
-                model.setPayType(OrderPayType.getDataByType(thirdPartyModel.getPayType()).getName());
+                model.setPayType(OrderPayType.getDataByType(thirdPartyModel.getPayType()) == null ? "暂无" : OrderPayType.getDataByType(thirdPartyModel.getPayType()).getName());
                 model.setOrderStatus(OrderStatusEnum.getNameByType(thirdPartyModel.getOrderStatus()));
                 model.setCreateTime(thirdPartyModel.getCreateTime());
                 model.setPayTime(thirdPartyModel.getPayTime());

hai-order/src/main/resources/prod/application.yml

@@ -63,8 +63,13 @@ spring:
 rocketmq:
   name-server: 122.9.135.148:9876
   producer:
+    access-key: huifu
+    secret-key: huifukeji2013@!
     #必须指定group
     group: default-group
+  consumer:
+    access-key: huifu
+    secret-key: huifukeji2013@!
 
 mybatis:
   mapperLocations:

hai-service/src/main/java/com/hai/config/ZkcPrinterTemplate.java

@@ -11,7 +11,7 @@ import java.util.Date;
 import java.util.Map;
 
 /**
- * ZKC云打印机模板
+ * ZKC云模板
  * @author hurui
  */
 public class ZkcPrinterTemplate {

hai-service/src/main/java/com/hai/model/UserModel.java

@@ -47,7 +47,26 @@ public class UserModel {
     // 油卡信息
     private Map<String, Object> oilCard;
 
+    private Boolean isSetOilCarCard;
 
+    // 油卡信息
+    private Map<String, Object> oilCarCard;
+
+    public Boolean getSetOilCarCard() {
+        return isSetOilCarCard;
+    }
+
+    public void setSetOilCarCard(Boolean setOilCarCard) {
+        isSetOilCarCard = setOilCarCard;
+    }
+
+    public Map<String, Object> getOilCarCard() {
+        return oilCarCard;
+    }
+
+    public void setOilCarCard(Map<String, Object> oilCarCard) {
+        this.oilCarCard = oilCarCard;
+    }
 
     public Boolean getIsSetOilCard() {
         return isSetOilCard;

hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java

@@ -86,6 +86,12 @@ public class OrderPayServiceImpl implements OrderPayService {
             goodsDesc = "购买话费";
             tranDesc = "购买" + order.getHighChildOrderList().get(0).getGoodsName();
 
+        } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE12.getNumber())) {
+            instCode = "11101608";
+            businessType = "actual_goods";
+            goodsDesc = "购买实物产品";
+            tranDesc = "购买" + order.getHighChildOrderList().get(0).getGoodsName();
+
         } else {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法支付，请使用其他支付方式");
         }

hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java

@@ -166,6 +166,8 @@ public class OrderServiceImpl implements OrderService {
         HighOrder order = new HighOrder();
         if (popularizeUser != null && createOrderModel.getMemId() != null) {
             order.setPromoteCode(popularizeUser.getAgentId().toString());
+        }else {
+            order.setPromoteCode(createOrderModel.getPromoteCode());
         }
 
         order.setOrderNo(createOrderModel.getOrderNo());

hai-service/src/main/java/com/hai/service/impl/CmsContentServiceImpl.java

@@ -211,8 +211,9 @@ public class CmsContentServiceImpl implements CmsContentService {
 
         CmsContentExample example = new CmsContentExample();
         example.createCriteria().andCategoryIdEqualTo(categoryId).andStatusEqualTo(2).andCompanyIdEqualTo(companyId).andPlatformEqualTo(platform);
-
+        example.setOrderByClause("sort_id asc");
         return cmsContentMapper.selectByExample(example);
+
     }
 
     @Override

hai-service/src/main/java/com/hai/service/impl/HighGasServiceImpl.java

@@ -480,7 +480,7 @@ public class HighGasServiceImpl implements HighGasService {
                 store.setCompanyId(merchant.getCompanyId());
                 store.setStoreKey(object.getString("jyzid"));
                 store.setStoreName(object.getString("mingcheng"));
-                store.setStoreLogo(object.getString("tupian"));
+//                store.setStoreLogo(object.getString("tupian"));
                 store.setRegionId(region.getRegionId());
                 store.setRegionName(object.getString("province"));
                 store.setAddress(object.getString("dizhi"));
@@ -530,7 +530,7 @@ public class HighGasServiceImpl implements HighGasService {
                 highMerchantStore.setCompanyId(merchant.getCompanyId());
                 highMerchantStore.setStoreKey(object.getString("jyzid"));
                 highMerchantStore.setStoreName(object.getString("mingcheng"));
-                highMerchantStore.setStoreLogo(object.getString("tupian"));
+//                highMerchantStore.setStoreLogo(object.getString("tupian"));
                 highMerchantStore.setRegionId(region.getRegionId());
                 highMerchantStore.setRegionName(object.getString("province"));
                 highMerchantStore.setAddress(object.getString("dizhi"));

hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java

@@ -219,6 +219,7 @@ public class HighUserServiceImpl implements HighUserService {
 
         // 查询油卡
         List<HighUserCard> oilCardList = highUserCardService.getListByUser(userId, UserCardType.type2.getType());
+        List<HighUserCard> carOilCardList = highUserCardService.getListByUser(userId, UserCardType.type3.getType());
         if (oilCardList.size() > 0) {
             user.setIsSetOilCard(true);
             // 查询油卡
@@ -233,6 +234,20 @@ public class HighUserServiceImpl implements HighUserService {
             user.setIsSetOilCard(false);
         }
 
+        if (carOilCardList.size() > 0) {
+            user.setSetOilCarCard(true);
+            // 查询油卡
+            HighOilCard CarOilCard = oilCardService.getOilCardByCardNo(carOilCardList.get(0).getCardNo());
+            if (CarOilCard != null) {
+                Map<String, Object> CarOilCardMap = new HashMap<>();
+                CarOilCardMap.put("cardNo", CarOilCard.getCardNo());
+                CarOilCardMap.put("amount", CarOilCard.getAmount());
+                user.setOilCarCard(CarOilCardMap);
+            }
+        } else {
+            user.setSetOilCarCard(false);
+        }
+
         return user;
     }
 

hai-service/src/main/resources/dev/commonConfig.properties

@@ -140,6 +140,6 @@ filesystem=https://hsgcs.dctpay.com/filesystem/
 blxPostUrl=https://vertical-formats-gateway.blx.bodata.cn:18443
 
 #DianDian
-diandianwPostUrl=http://test.diandianw.cn/youdianyou_test/
+diandianwPostUrl=http://www.diandianw.cn/youdianyou/
-diandianwAppid=10071000470d6z3rs80fc537qp7ipr4s
+diandianwAppid=1016145002rmz7dkti3f5oqh1razswc0
-diandianwAppSecret=syz5cfetikr4by6gzxndpubtf6ht6zs5
+diandianwAppSecret=msk48q5jinmpsfdgpcyryx6lhkoiii4s