支付信誉保证金修改

pom.xml

@@ -256,7 +256,7 @@
                     <encoding>UTF-8</encoding>
                     <compilerArguments>
                         <verbose />
-                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
+                        <bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar</bootclasspath>
                     </compilerArguments>
                 </configuration>
             </plugin>

wjj-api/src/main/java/com/demo/wjj/controller/PaySaleController.java

@@ -74,15 +74,15 @@ public class PaySaleController {
             return ApiResult.createFailure();
         }
 
-        if (StringUtils.isBlank(name)) {
-            LOG.info("name为空");
-            return ApiResult.createFailure();
-        }
-
-        if (StringUtils.isBlank(mobile)) {
-            LOG.info("mobile为空");
-            return ApiResult.createFailure();
-        }
+//        if (StringUtils.isBlank(name)) {
+//            LOG.info("name为空");
+//            return ApiResult.createFailure();
+//        }
+//
+//        if (StringUtils.isBlank(mobile)) {
+//            LOG.info("mobile为空");
+//            return ApiResult.createFailure();
+//        }
 
         /* 手机端用户不能设置通票 wangqing 201811302208
         if (StringUtils.isBlank(tp)) {

wjj-core/src/main/java/com/demo/wjj/service/impl/PaySaleServiceImpl.java

@@ -2,6 +2,7 @@ package com.demo.wjj.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.demo.wjj.bo.*;
+import com.demo.wjj.mapper.ExplainMapper;
 import com.demo.wjj.mapper.OfferMapper;
 import com.demo.wjj.po.*;
 import com.demo.wjj.service.*;
@@ -49,6 +50,9 @@ public class PaySaleServiceImpl implements PaySaleService {
     @Value("${weixin.pay.apiAddress}")
     private String payApiAddress;
 
+    @Value("${jpjgh}")
+    private String jpjgh;
+
     @Autowired
     private AgentService agentService;
 
@@ -73,6 +77,15 @@ public class PaySaleServiceImpl implements PaySaleService {
     @Autowired
     private OfferMapper offerMapper;
 
+    @Autowired
+    DisplaceAuditService displaceAuditService;
+
+    @Autowired
+    ExplainMapper explainMapper;
+
+    @Autowired
+    private CreditsExchangeService creditsExchangeService;
+
     @CommitTransactional
     @Override
     public ExecuteResult<CreateOrderResult> createOrder(CreateOrderBo createOrderBo) {
@@ -149,14 +162,12 @@ public class PaySaleServiceImpl implements PaySaleService {
         }
 
         //获取保证金
-        Integer deposit = offerMapper.selectDisplaceDeposit(productId);
-
-
-        if (deposit == null || deposit <= 0) {
-            LOG.info("销售员保证金无效, deposit:{}", deposit);
-            return new ExecuteResult<CreateOrderResult>()
-                    .setExecuteResult(false)
-                    .setResult(Result.Failure);
+        Integer deposit = 0;
+        if(jpjgh.equals(agentId)){
+            List<Explain> explain=explainMapper.selectExplain();
+            deposit=Integer.parseInt(explain.get(0).getDeposit())*100;
+        }else{
+            deposit=creditsExchangeService.selectByUserId(agentId).getCashDiposit()*100;
         }
 
         CreateOrderParameter orderParameter = new CreateOrderParameter();
@@ -450,6 +461,8 @@ public class PaySaleServiceImpl implements PaySaleService {
                 weiXinPayService.updateOrderStatus(weiXinPay.getId(), WeiXinPay.ORDER_STATUS_MONEY_ERROR);
                 return null;
             } else {
+                LOG.info("更新是否支付保证金="+weiXinPay.getProductId());
+                displaceAuditService.updateByDisplaceId(weiXinPay.getProductId(),"2","1");
                 weiXinPayService.updateOrderStatus(weiXinPay.getId(), WeiXinPay.ORDER_STATUS_SUCCESS);
                 depositService.updatePayStatus(weiXinPay.getOrderNo(), transactionId, "1");
 

wjj-core/src/main/java/com/demo/wjj/service/impl/PayforServiceImpl.java

@@ -419,8 +419,6 @@ public class PayforServiceImpl implements PayforService{
                 weiXinPayService.updateOrderStatus(weiXinPay.getId(), WeiXinPay.ORDER_STATUS_MONEY_ERROR);
                 return null;
             } else {
-                LOG.info("更新是否支付保证金="+weiXinPay.getProductId());
-                displaceAuditService.updateByDisplaceId(weiXinPay.getProductId(),"2","1");
                 weiXinPayService.updateOrderStatus(weiXinPay.getId(), WeiXinPay.ORDER_STATUS_SUCCESS);
                 depositService.updatePayStatus(weiXinPay.getOrderNo(), transactionId, "1");
             }

wjj-core/src/main/java/com/demo/wjj/service/impl/WeChatServiceImpl.java

@@ -859,6 +859,8 @@ public class WeChatServiceImpl implements WeChatService, InitializingBean {
             publicTemplateId = "OPENTM417959522";
         }else if("认证审核提醒".equals(templateName)) {
             publicTemplateId = "OPENTM415235881";
+        }else if("订单待确认通知".equals(templateName)) {
+            publicTemplateId = "OPENTM416102658";
         } else {
             LOG.info("请求微信模板列表, 模板名称错误。templateName:{}", templateName);
             return null;

wjj-core/src/main/resources/mybatis/SaleMapper.xml

@@ -39,7 +39,7 @@
         <result column="wx_openid" property="wxOpenId"/>
         <result column="member_level" property="memberLevel"/>
         <result column="integral" property="integral"/>
-        <result column="plat_tp_set" property="integral"/>
+        <result column="plat_tp_set" property="platTpSet"/>
         <result column="deposit" property="deposit"/>
 
     </resultMap>