提交代码

hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java

@@ -303,7 +303,7 @@ public class HighCouponController {
             }
 
             // 中石化
-            if (coupon.getCouponSource() != 4) {
+            if (coupon.getCouponSource() != null && coupon.getCouponSource() != 4) {
                 // 根据卡卷查询 销售码库存
                 if (highCouponCodeService.getStockCountByCoupon(coupon.getId()) == 0) {
                     log.error("HighCouponController -> upShelfApprove() error!","卡卷库存数量错误");

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

@@ -206,6 +206,9 @@ public class HighOrderController {
                         log.error("HighOrderController --> addOrder() error!", "参数错误");
                         throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
                     }
+                    if (childOrder.getGoodsPrice().compareTo(new BigDecimal("500")) == 1){
+                        throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "加油金额不能超过500元");
+                    }
                     // 查询门店
                     HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(childOrder.getGoodsId());
                     if (store == null) {
@@ -397,8 +400,8 @@ public class HighOrderController {
     }
 
     public static void main(String[] args) {
-        System.out.println(new BigDecimal("10").divide(new BigDecimal("7.20"),10,BigDecimal.ROUND_DOWN)
-                .multiply(new BigDecimal("6.75")).setScale(2,BigDecimal.ROUND_HALF_UP));
+        System.out.println(new BigDecimal("100").divide(new BigDecimal("8.10"),10,BigDecimal.ROUND_DOWN)
+                .multiply(new BigDecimal("7.69")).setScale(2,BigDecimal.ROUND_HALF_UP));
     }
 
     @RequestMapping(value = "/getOrderById", method = RequestMethod.GET)

hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java

@@ -516,7 +516,7 @@ public class OrderController {
             order.setPaySerialNo(orgTrace);
             highOrderService.updateOrderDetail(order);
 
-            return ResponseMsgUtil.success(unionStagingPayConfig.advancePay(order.getPaySerialNo(),order.getPaySerialNo(),order.getPayPrice(), "",request));
+            return ResponseMsgUtil.success(unionStagingPayConfig.advancePay(order.getPaySerialNo(),order.getPaySerialNo(),order.getPayPrice(), CommonSysConst.getSysConfig().getUnionStagingPayNotifyUrl(),request));
 
         } catch (Exception e) {
             log.error("orderToPay error!", e);

hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java

@@ -148,7 +148,7 @@ public class UnionPayController {
                         order.setPayRealPrice(order.getPayPrice()); // 实付金额
                         order.setPayTime(new Date()); // 支付时间
                         order.setPayModel(2);         // 支付模式：1 金币，2 第三方平台，3 混合
-                        order.setPayType(5);          // 支付方式： 1：支付宝  2：微信  3：金币  4:工会卡  5:银联
+                        order.setPayType(6);          // 支付方式： 1：支付宝  2：微信  3：金币  4:工会卡  5:银联   6:银联分期
                         order.setOrderStatus(2);      // 订单状态：1 待支付  2 已支付  3.已完成  4. 已退款  5.已取消
 
                         for (HighChildOrder highChildOrder : order.getHighChildOrderList()) {

hai-service/src/main/java/com/hai/common/security/AESEncodeUtil.java

@@ -1,5 +1,6 @@
 package com.hai.common.security;
 
+import com.hai.common.Base64Util;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.crypto.Cipher;
@@ -62,7 +63,7 @@ public class AESEncodeUtil {
     public static void main(String[] args) throws Exception{
         long currentTimeMillis = System.currentTimeMillis();
 
-        System.out.println(AESEncodeUtil.aesDecrypt("XSUbgIc5vc0/ZTB+qTrIww=="));
+        System.out.println(AESEncodeUtil.aesDecrypt(Base64Util.decode("ZStZUjRIcFl5SVo4MEhzSU96MldDUEFZa3lmbUhpNTdKMGhCVytIY3NJaz0")));
 /*        String content = "{\"create_time\":1573544092110,\"order_serial_no\":\"40280e816db49c0b016db4a2c31f0004\",\"product_code\":\"8a9e80045cf85e54015cf8809fcd\",\"product_name\":\"平安发票贷\",\"uscc\":\"91370781687233838E\"}";
         System.out.println("加密前" + content);
 

hai-service/src/main/java/com/hai/common/utils/HttpsUtils.java

@@ -50,7 +50,7 @@ public class HttpsUtils {
 	
 	private static PoolingHttpClientConnectionManager	connMgr;
 	private static RequestConfig				requestConfig;
-	private static final int				MAX_TIMEOUT	= 7000;
+	private static final int				MAX_TIMEOUT	= 15000;
  
 	static {
 		// 设置连接池

hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapperExt.java

@@ -24,6 +24,7 @@ public interface HighGasOilPriceMapperExt {
             " high_merchant_store b " +
             " WHERE" +
             " a.merchant_store_id = b.id " +
+            " AND b.`status` = 1 " +
             " AND b.region_id = #{regionId} " +
             " AND a.oil_no_name = #{oilNoName}" +
             "<if test='storeName != null'> and b.store_name like '%${storeName}%'</if>" +

hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java

@@ -204,6 +204,9 @@ public interface HighOrderMapperExt {
             " b.id orderId, " +
             " a.goods_name goodsName, " +
             " a.goods_type goodsTypeId," +
+            " a.total_price goodsTotalPrice," +
+            " a.goods_actual_price goodsActualPrice," +
+            " a.sale_count saleCount," +
             " case a.giveaway_type when 1 then '赠送' when 0 then '购买' end giveawayType," +
             " b.order_no orderNo," +
             " b.mem_name memName," +

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

@@ -8,6 +8,9 @@ public class HighOrderModel {
     private String merchantName;
     private String goodsType;
     private String goodsName;
+    private String saleCount;
+    private String goodsTotalPrice;
+    private String goodsActualPrice;
     private String giveawayType;
     private String orderNo;
     private String memName;
@@ -31,6 +34,30 @@ public class HighOrderModel {
     private Integer goodsTypeId;
     private Integer orderStatusId;
 
+    public String getSaleCount() {
+        return saleCount;
+    }
+
+    public void setSaleCount(String saleCount) {
+        this.saleCount = saleCount;
+    }
+
+    public String getGoodsTotalPrice() {
+        return goodsTotalPrice;
+    }
+
+    public void setGoodsTotalPrice(String goodsTotalPrice) {
+        this.goodsTotalPrice = goodsTotalPrice;
+    }
+
+    public String getGoodsActualPrice() {
+        return goodsActualPrice;
+    }
+
+    public void setGoodsActualPrice(String goodsActualPrice) {
+        this.goodsActualPrice = goodsActualPrice;
+    }
+
     public Long getOrderId() {
         return orderId;
     }