代码更新

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

@@ -180,6 +180,28 @@ public class CertificationController {
         }
     }
 
+    @PostMapping("/getUserInfoBySaleIdPost")
+    public boolean getUserInfoBySaleIdPost(String agentId,String saleId) {
+        LOG.info("调用获取用户信息(/certification/getUserInfoBySaleId)接口");
+        boolean flag=false;
+        try {
+            //获取销售员信息
+            Sale sale=saleService.getSale(saleId);
+            if(sale==null){
+                LOG.info("销售员信息不存在");
+                return false;
+            }
+            UserInfo userInfo = certificationService.getUserInfoBySaleId(agentId,sale.getWxOpenId());
+            if(userInfo!=null&&"2".equals(userInfo.getStatus())){
+                return true;
+            }
+            return false;
+        } catch (Exception e) {
+            LOG.error("调用获取用户信息(/certification/getUserInfoBySaleId)接口异常", e);
+            return false;
+        }
+    }
+
     /**,
      * 四要素验证
      *

wjj-api/src/test/java/com/demo/wjj/controller/CertificationControllerTest.java

@@ -46,7 +46,7 @@ public class CertificationControllerTest extends BaseTest {
     public void getUserInfoBySaleId() throws Exception {
         mockMvc.perform(get("/certification/getUserInfoBySaleId")
                 .param("status", "2")
-                .param("angentId", "ZHXTCS")
+                .param("agentId", "ZHXTCS")
                 .param("saleId", "ZHXTCS-XS5021"))
                 .andExpect(status().isOk());
     }

wjj-api/src/test/java/com/demo/wjj/controller/DisplaceControllerTest.java

@@ -95,9 +95,17 @@ public class DisplaceControllerTest extends BaseTest {
     @Test
     public void getDisplaceGoodBuyList() throws Exception {
         mockMvc.perform(get("/displace/getDisplaceGoodBuyList")
-                .param("openId", "o5C8F1bsANIpREV4ThGib-ixh0xs")
+                .param("openId", "o5C8F1R066yPe4DcKa2h4fADR8K4")
                 .param("agentId", "ZHXTCS")
-                .param("type", "1"))
+                .param("type", "4"))
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void getDisplaceConfirmList() throws Exception {
+        mockMvc.perform(get("/displace/getDisplaceConfirmList")
+                .param("openId", "o5C8F1R066yPe4DcKa2h4fADR8K4")
+                .param("agentId", "ZHXTCS"))
                 .andExpect(status().isOk());
     }
 }

wjj-core/src/main/java/com/demo/wjj/mapper/DisplaceAuditMapper.java

@@ -41,8 +41,10 @@ public interface DisplaceAuditMapper {
     List<DisplaceListBo> selectDisplaceSaleList(@Param("agentId") String agentId, @Param("now") Date now, @Param("auditStatus") String auditStatus);
     List<DisplaceListBo> selectDisplaceHaltList(@Param("agentId") String agentId, @Param("now") Date now, @Param("auditStatus") String auditStatus);
     List<DisplaceListBo> selectDisplaceMyList(@Param("agentId") String agentId, @Param("openId") String openId, @Param("now") Date now, @Param("auditStatus") String auditStatus);
+    List<DisplaceListBo> selectMyList(@Param("agentId") String agentId, @Param("diggerAgentId") String diggerAgentId);
     List<DisplaceListBo> getDisplaceGoodSaleList(@Param("agentId") String agentId, @Param("openId") String openId, @Param("now") Date now, @Param("auditStatus") String auditStatus);
     List<DisplaceListBo> getDisplaceStorageList(@Param("agentId") String agentId, @Param("openId") String openId, @Param("storageStatus") String storageStatus);
+    int updateByDisplaceId(@Param("displaceId") String displaceId, @Param("ifDeposit") String ifDeposit);
 
     /**
      * 查询置换详情

wjj-core/src/main/java/com/demo/wjj/mapper/SaleMapper.java

@@ -56,7 +56,7 @@ public interface SaleMapper {
      * @param saleId 销售员id
      * @return 销售员
      */
-    Sale selectSaleOfId(String saleId);
+    Sale selectSaleOfId(@Param("saleId") String saleId);
     /**
      * 修改微信公众号id
      * @param agentId

wjj-core/src/main/java/com/demo/wjj/po/DisplaceAudit.java

@@ -25,6 +25,11 @@ public class DisplaceAudit extends BasePo {
     public static final String AUDIT_STATUS_UNGROUND = "4";
 
     /**
+     * 审核状态 - 已审核 已上架
+     */
+    public static final String AUDIT_STATUS_ROUND = "1";
+
+    /**
      * 记录是否显示 - 是
      */
     public static final String STATE_SHOW = "1";
@@ -144,6 +149,15 @@ public class DisplaceAudit extends BasePo {
 
     private int bill;
 
+    private String upType;
+
+    public String getUpType() {
+        return upType;
+    }
+
+    public void setUpType(String upType) {
+        this.upType = upType;
+    }
 
     public String getIs_good() {
         return is_good;

wjj-core/src/main/java/com/demo/wjj/service/DisplaceAuditService.java

@@ -46,6 +46,9 @@ public interface DisplaceAuditService {
 
     PageInfo<DisplaceListBo> getDisplaceConfirmList(String agentId, String openId, PageBean pageBean);
 
+    int updateByDisplaceId(String displaceId, String ifDeposit);
+
+
 
     /**
      * 查询已审核的置换

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

@@ -4,6 +4,7 @@ import com.demo.wjj.bo.DisplaceDetailBo;
 import com.demo.wjj.bo.DisplaceListBo;
 import com.demo.wjj.mapper.DisplaceAuditMapper;
 import com.demo.wjj.mapper.ExplainMapper;
+import com.demo.wjj.po.DiggerAgent;
 import com.demo.wjj.po.DisplaceAudit;
 import com.demo.wjj.po.Explain;
 import com.demo.wjj.service.*;
@@ -40,6 +41,9 @@ public class DisplaceAuditServiceImpl implements DisplaceAuditService {
     @Autowired
     private ExplainMapper explainMapper;
 
+    @Autowired
+    private DiggerAgentService diggerAgentService;
+
     @CommitTransactional
     @Override
     public boolean save(DisplaceAudit displaceAudit, boolean updateOperate) {
@@ -89,11 +93,18 @@ public class DisplaceAuditServiceImpl implements DisplaceAuditService {
         if("1".equals(type)){
             displaceListBos = displaceAuditMapper.selectDisplaceOnList(agentId, new Date(), DisplaceAudit.AUDIT_STATUS_DONE);
         }else if("2".equals(type)){
-            displaceListBos = displaceAuditMapper.selectDisplaceSaleList(agentId, new Date(), DisplaceAudit.AUDIT_STATUS_DONE);
-        }else if("3".equals(type)){
             displaceListBos = displaceAuditMapper.selectDisplaceHaltList(agentId, new Date(), DisplaceAudit.AUDIT_STATUS_DONE);
+        }else if("3".equals(type)){
+            displaceListBos = displaceAuditMapper.selectDisplaceSaleList(agentId, new Date(), DisplaceAudit.AUDIT_STATUS_DONE);
         }else{
-            displaceListBos = displaceAuditMapper.selectDisplaceMyList(agentId, openId, new Date(), DisplaceAudit.AUDIT_STATUS_DONE);
+            DiggerAgent diggerAgent = diggerAgentService.getDiggerAgent(agentId, openId);
+            if (diggerAgent == null) {
+                LOG.info("未查找到车商信息, agentId:{}, openId:{}", agentId, openId);
+                return null;
+            }
+
+            PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize(), true);
+            displaceListBos = displaceAuditMapper.selectMyList(agentId, diggerAgent.getDaId());
         }
         displaceAssemblyService.assembleListAttrContent(displaceListBos);
         LOG.info("退出查询置换列表");
@@ -109,7 +120,7 @@ public class DisplaceAuditServiceImpl implements DisplaceAuditService {
         }
         List<DisplaceListBo> displaceListBos=null;
         PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize(), true);
-        displaceListBos = displaceAuditMapper.getDisplaceGoodSaleList(agentId, openId, new Date(), DisplaceAudit.AUDIT_STATUS_DONE);
+        displaceListBos = displaceAuditMapper.getDisplaceGoodSaleList(agentId, openId, new Date(), DisplaceAudit.AUDIT_STATUS_UNGROUND);
         displaceAssemblyService.assembleListAttrContent(displaceListBos);
         LOG.info("退出查询置换列表");
         return new PageInfo<>(displaceListBos);
@@ -142,12 +153,17 @@ public class DisplaceAuditServiceImpl implements DisplaceAuditService {
         }
 
         PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize(), true);
-        List<DisplaceListBo> displaceListBos = displaceAuditMapper.selectDisplaceConfirmList(agentId, openId, DisplaceAudit.AUDIT_STATUS_UNGROUND);
+        List<DisplaceListBo> displaceListBos = displaceAuditMapper.selectDisplaceConfirmList(agentId, openId, DisplaceAudit.AUDIT_STATUS_ROUND);
         displaceAssemblyService.assembleListAttrContent(displaceListBos);
         LOG.info("退出查询待审核的列表");
         return new PageInfo<>(displaceListBos);
     }
 
+    @Override
+    public int updateByDisplaceId(String displaceId, String ifDeposit) {
+        return displaceAuditMapper.updateByDisplaceId(displaceId,ifDeposit);
+    }
+
     @ReadOnlyTransactional
     @Override
     public PageInfo<DisplaceListBo> queryDoneDisplaceList(String agentId, String openId, PageBean pageBean) {

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

@@ -191,6 +191,7 @@ public class OfferServiceImpl implements OfferService {
         final Date now = new Date();
 
         DisplaceAudit displaceAudit = displaceAuditService.getDisplaceAudit(displaceId);
+
         ExecuteResult checkResult = checkDisplaceAudit(agentId, displaceId, displaceAudit, now);
         if (!checkResult.isExecuteResult()) {
             return checkResult;
@@ -362,6 +363,13 @@ public class OfferServiceImpl implements OfferService {
             newEndTime.add(Calendar.SECOND, delay);
             displaceAuditService.updateEndTime(displaceAudit.getId(), newEndTime.getTime());
         }
+        //精品机一口价成交处理
+        if("2".equals(displaceAudit.getIs_good())&&"3".equals(displaceAudit.getUpType())&&displaceAudit.getPersist_price()<=diggerOfferSaveBo.getPrice()){
+            //更新置换 结束时间
+            Calendar newEndTime = Calendar.getInstance();
+            newEndTime.setTime(now);
+            displaceAuditService.updateEndTime(displaceAudit.getId(), newEndTime.getTime());
+        }
 
 
 

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

@@ -73,6 +73,9 @@ public class PayServiceImpl implements PayService {
     @Autowired
     private DisplaceOfferUserService displaceOfferUserService;
 
+    @Autowired
+    DisplaceAuditService displaceAuditService;
+
     @CommitTransactional
     @Override
     public ExecuteResult<CreateOrderResult> createOrder(CreateOrderBo createOrderBo) {
@@ -265,7 +268,8 @@ public class PayServiceImpl implements PayService {
         // 默认不是通票, 通票是不需要支付保证金
         newDeposit.setIsCommon("0");
         depositService.save(newDeposit);
-
+        LOG.info("更新是否支付保证金");
+        displaceAuditService.updateByDisplaceId(productId,"2");
         CreateOrderResult createOrderResult = new CreateOrderResult();
         createOrderResult.setAppId(appId);
         createOrderResult.setTimeStamp(String.valueOf(System.currentTimeMillis() / 1000));

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

@@ -65,6 +65,9 @@ public class PayforServiceImpl implements PayforService{
     @Autowired
     private DepositService depositService;
 
+    @Autowired
+    DisplaceAuditService displaceAuditService;
+
 
 
     @Override
@@ -219,6 +222,8 @@ public class PayforServiceImpl implements PayforService{
         // 默认不是通票, 通票是不需要支付保证金
         newDeposit.setIsCommon("0");
         depositService.save(newDeposit);
+        LOG.info("更新是否支付保证金");
+        displaceAuditService.updateByDisplaceId(productId,"2");
         CreateOrderResult createOrderResult = new CreateOrderResult();
         createOrderResult.setAppId(appId);
         createOrderResult.setTimeStamp(String.valueOf(System.currentTimeMillis() / 1000));

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

@@ -86,7 +86,7 @@
             FROM tb_offer_detail d JOIN tb_offer o ON d.offer_id = o.id
             WHERE d.da_id = #{diggerAgentId}
         ) t JOIN tb_displace_audit a ON t.displace_id = a.displace_id LEFT JOIN tb_offer o ON a.displace_id = o.displace_id
-        WHERE a.audit_status IN ('1', '3') AND a.state = '1' AND a.agent_id = #{agentId}
+        WHERE a.audit_status IN ('1', '3') AND a.state = '1' AND a.agent_id = #{agentId} and is_good='1'
         ORDER BY a.start_time DESC
     </select>
 

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

@@ -32,6 +32,12 @@
         WHERE id = #{id}
     </update>
 
+    <update id="updateByDisplaceId">
+        UPDATE tb_displace_audit
+        SET if_deposit = #{ifDeposit}
+        WHERE displace_id = #{displaceId}
+    </update>
+
     <!--更新报价结束时间-->
     <update id="updateEndTime">
         UPDATE tb_displace_audit SET end_time = #{endTime} WHERE id = #{id}
@@ -56,18 +62,18 @@
 
     <!--查询待确认-->
     <select id="selectDisplaceConfirmList" resultType="com.demo.wjj.bo.DisplaceListBo">
-        SELECT a.id, a.displace_id displaceId, a.audit_status auditStatus, a.first_pic_url picUrl
+        SELECT a.id,a.is_kxc isKxc, a.up_type upType, a.displace_id displaceId, IFNULL(a.look_times, 0) lookTimes, a.first_pic_url picUrl, a.start_time , a.end_time startTime, a.storage,a.is_good,a.min_price,a.max_price,a.persist_price
         FROM tb_displace_audit a
         JOIN tb_sales s ON a.sale_id = s.sale_id
-        JOIN tb_digger_agent d ON d.wx_openid = s.wx_openid
-        JOIN tb_deposit b ON b.da_id = d.id
         WHERE
-        a.audit_status = #{auditStatus}
-        AND a.agent_id = #{agentId} AND s.agent_id = #{agentId} AND s.wx_openid = #{openId}
+        a.audit_status IN ('1', '3')
+        AND a.agent_id = #{agentId}
+        AND s.wx_openid = #{openId}
         AND a.state = '1'
-        AND b.is_common='0'
-        AND b.pay_status='0'
-        ORDER BY a.displace_id DESC
+        AND a.is_good='2'
+        AND a.storage='1'
+        And a.if_deposit='1'
+        ORDER BY a.pub_time DESC
     </select>
 
     <!--查询置换详情-->
@@ -86,11 +92,12 @@
         <result column="end_time" property="endTime"/>
         <result column="time_delay" property="timeDelay"/>
         <result column="min_money" property="minMoney"/>
+        <result column="up_type" property="upType"/>
     </resultMap>
 
     <!--查询置换审核-->
     <select id="selectDisplaceAudit" resultMap="displaceAudit">
-        SELECT a.id, a.displace_id, a.agent_id, a.audit_status, a.start_time, a.end_time, a.bail, a.time_delay, a.min_money,a.persist_price
+        SELECT a.id, a.displace_id, a.agent_id, a.audit_status, a.start_time, a.end_time, a.bail, a.time_delay, a.min_money,a.persist_price,a.up_type
         FROM tb_displace_audit a
         WHERE a.state = '1' AND a.displace_id = #{displaceId}
     </select>
@@ -114,6 +121,7 @@
         AND a.state = '1'
         AND a.is_good='2'
         AND a.storage='1'
+        And a.if_deposit='2'
         ORDER BY a.start_time DESC
     </select>
 
@@ -130,6 +138,7 @@
         AND b.offer_times > 0
         AND a.is_good='2'
         AND a.storage='1'
+        And a.if_deposit='2'
         ORDER BY a.start_time DESC
     </select>
 
@@ -146,6 +155,7 @@
         AND b.displace_id=a.displace_id
         AND a.is_good='2'
         AND a.storage='1'
+        And a.if_deposit='2'
         ORDER BY a.start_time DESC
     </select>
 
@@ -168,6 +178,17 @@
         ORDER BY a.start_time DESC
     </select>
 
+    <select id="selectMyList" resultType="com.demo.wjj.bo.DisplaceListBo">
+        SELECT a.id,a.is_kxc isKxc, a.up_type upType, a.displace_id displaceId, IFNULL(a.look_times, 0) lookTimes, IFNULL(o.offer_times, 0) offerTimes, a.first_pic_url picUrl, a.start_time , a.end_time startTime, IFNULL(o.max_offer, a.min_money) currentPrice,a.storage,a.is_good,a.min_price,a.max_price,a.persist_price
+        FROM (
+        SELECT DISTINCT o.displace_id
+        FROM tb_offer_detail d JOIN tb_offer o ON d.offer_id = o.id
+        WHERE d.da_id = #{diggerAgentId}
+        ) t JOIN tb_displace_audit a ON t.displace_id = a.displace_id LEFT JOIN tb_offer o ON a.displace_id = o.displace_id
+        WHERE a.audit_status IN ('1', '3') AND a.state = '1' AND a.agent_id = #{agentId} and is_good='2'
+        ORDER BY a.start_time DESC
+    </select>
+
     <!--我要卖精品机-->
     <select id="getDisplaceGoodSaleList" resultType="com.demo.wjj.bo.DisplaceListBo">
         SELECT a.id,a.is_kxc isKxc, a.up_type upType, a.displace_id displaceId, IFNULL(a.look_times, 0) lookTimes, IFNULL(d.offer_times, 0) offerTimes, a.first_pic_url picUrl, a.start_time , a.end_time startTime, IFNULL(d.max_offer, a.min_money) currentPrice,a.storage,a.is_good,a.min_price,a.max_price,a.persist_price