Merge remote-tracking branch 'origin/master' into sale

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

@@ -181,6 +181,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/main/java/com/demo/wjj/controller/DisplaceController.java

@@ -28,11 +28,9 @@ import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 置换
@@ -205,7 +203,10 @@ public class DisplaceController {
     @GetMapping("/queryUndoList")
     public ApiResult queryUndoList(@RequestParam(required = false) String agentId, @RequestParam(required = false) String openId, HttpServletRequest request) {
         LOG.info("调用获取未审核置换列表(/displace/queryUndoList)接口, agentId:{}, openId:{}", agentId, openId);
-
+        String is_good="1";
+        if(agentId.equals(excellentAccount)){
+            is_good="2";
+        }
         if (StringUtils.isBlank(agentId)) {
             LOG.info("agentId为空");
             return ApiResult.createFailure();
@@ -217,7 +218,7 @@ public class DisplaceController {
         }
 
         try {
-            PageInfo<DisplaceListBo> pageInfo = displaceAuditService.queryUndoDisplaceList(agentId, openId, PageBean.create(request));
+            PageInfo<DisplaceListBo> pageInfo = displaceAuditService.queryUndoDisplaceList(agentId, openId, PageBean.create(request),is_good);
             ApiResult<PageInfo<DisplaceListBo>> apiResult = ApiResult.createSuccess(pageInfo);
             LOG.info("调用获取未审核置换列表(/displace/queryUndoList)接口成功");
             LOG.debug("未审核置换列表, apiResult:{}", apiResult);
@@ -249,9 +250,13 @@ public class DisplaceController {
             LOG.info("微信openId为空");
             return ApiResult.createFailure();
         }
+        String is_good="1";
+        if(agentId.equals(excellentAccount)){
+            is_good="2";
+        }
 
         try {
-            PageInfo<DisplaceListBo> pageInfo = displaceAuditService.queryDoneDisplaceList(agentId, openId, PageBean.create(request));
+            PageInfo<DisplaceListBo> pageInfo = displaceAuditService.queryDoneDisplaceList(agentId, openId, PageBean.create(request),is_good);
             ApiResult<PageInfo<DisplaceListBo>> apiResult = ApiResult.createSuccess(pageInfo);
             LOG.info("调用获取已审核置换列表(/displace/queryDoneList)接口成功");
             LOG.debug("未审核置换列表, apiResult:{}", apiResult);
@@ -474,4 +479,170 @@ public class DisplaceController {
             return ApiResult.createFailure();
         }
     }
+
+
+
+//    @RequestMapping("/appAddInfo2")
+//    public void appAddInfo2(String displaceId){
+//
+//        try {
+//            //获取置换信息
+//            DisplaceAudit displaceAuditBean=displaceAuditService.selectDisplaceAuditByDisplaceId(displaceId);
+//
+//            LOG.info("更新为已审核待上架");
+//
+//            // 记录id
+//            String id = displaceAuditBean.getId();
+//            // 车商ID
+//            String ids = displaceAuditBean.getIds();
+//            if(StringUtils.isEmpty(ids)) {
+//                LOG.info("addInfo error!=没有推送车商信息");
+//                return;
+//            }
+//
+//            // 销售员ID
+//            String saleId = displaceAuditBean.getSaleId();
+//            //取出带过来的置换ID
+//            DisplaceAuditBean displace = displaceAuditService.queryAuditPageByDisplaceId(displaceId);
+//            //设备名称
+//            String sbmc = displace.getAttrContent().get("sbpp") + " " + displace.getAttrContent().get("sbxh") + " " + displace.getAttrContent().get("sblx");
+//            // 发布时间
+//            String pubTimeStr = "";
+//            Date pubTime = displaceAuditBean.getPubTime();
+//            try {
+//                pubTimeStr = DateUtil.format(pubTime, "yyyy年MM月dd日 HH:mm");
+//            } catch (Exception e) {
+//                pubTimeStr = "";
+//            }
+//
+//            //存储被推送人 ids
+//            displaceAuditBean.setIds(ids);
+//            PushRecordBean pushRecord = null;
+//            List<PushRecordBean> list = new ArrayList<PushRecordBean>();
+//            String agentId=displaceAuditBean.getAgentId();
+//            AgentBean agentBean = agentBeanService.getAgentBeanByAgentId(agentId);
+//            if(agentBean == null) {
+//                resultBean = new PageResultBean(PageResultBean.FAIL_CODE, "未查询到代理商信息！");
+//                return;
+//            }
+//            String agentName = agentBean.getAgentName();
+//            String appId =agentBean.getPubAppId();
+//            String appSecret = agentBean.getPubAppSecret();
+//            Date startTime = displaceAuditBean.getStartTime();
+//            Date endTime = displaceAuditBean.getEndTime();
+//
+//            // 反馈内容
+//            //  String diggerUrl = TemplateConstants.ZHSH_DIGGER_URL + "?agentId=" + agentId + "&id=" + id;
+//            String diggerUrl = "https://www.weigongcheng.net/wjj-api/index.html#/join" + "?agentId=" + agentId + "&displaceId=" + displaceId + "&status=" + displaceAuditBean.getAuditStatus() + "&id=" + id;
+//            String sms = TemplateConstants.ZHSH_DIGGER_UP_SMS;
+//            sms = sms.replaceAll("agentName", agentName);
+//            sms = sms.replaceAll("displaceId", displaceId);
+//            sms = sms.replaceAll("sbmc", sbmc);
+//
+//            String wxsms = TemplateConstants.ZHSH_DIGGER_TEMPLATE_CONTENT;
+//            wxsms = wxsms.replaceAll("first", "有一台设备正在寻找买家");
+//            wxsms = wxsms.replaceAll("keyword1", sbmc + "");
+//            if ("3".equals(displaceAuditBean.getUpType())) {
+//                wxsms = wxsms.replaceAll("keyword2", "最低价：" + displaceAuditBean.getMinPrice() + "万元-最高价：" + displaceAuditBean.getMaxPrice() + "万元");
+//            } else {
+//                wxsms = wxsms.replaceAll("keyword2", displaceAuditBean.getMinMoney() + "万元");
+//            }
+//            wxsms = wxsms.replaceAll("keyword3", displaceAuditBean.getMoneyRange() + "万元");
+//            wxsms = wxsms.replaceAll("keyword4", DateUtil.format(startTime, "yyyy年MM月dd日 HH:mm"));
+//            wxsms = wxsms.replaceAll("keyword5", displaceAuditBean.getBail() + "万元");
+//            wxsms = wxsms.replaceAll("remark", "点击【详情】前往查看！");
+//
+//            // 发送车商信息
+//            String[] diggers = ids.substring(0, ids.lastIndexOf(",")).split(",");
+//            for (int i = 0; i < diggers.length; i++) {
+//                //获取车商bean，并获取车商微信openid和其他信息
+//                DiggerBean digger = diggerBeanService.queryDiggerByID(diggers[i]);
+//                if (digger == null) {
+//                    continue;
+//                }
+//                String openId = digger.getWxOpenID();
+//                String wxnc = digger.getDaWxnc();
+//                String wxh = digger.getDaWxh();
+//                String name = digger.getDaName();
+//                String phone = digger.getDaPhone();
+//
+//                // 组装车商微信内容
+//                Map<String, TemplateData> param1 = new HashMap<String, TemplateData>();
+//                param1.put("first", new TemplateData("有一台设备正在寻找买家", "#696969"));
+//                param1.put("keyword1", new TemplateData(sbmc + "", "#696969"));
+//                if ("3".equals(displaceAuditBean.getUpType())) {
+//                    param1.put("keyword2", new TemplateData("最低价：" + displaceAuditBean.getMinPrice() + "万元-最高价：" + displaceAuditBean.getMaxPrice() + "万元", "#696969"));
+//                } else {
+//                    param1.put("keyword2", new TemplateData(displaceAuditBean.getMinMoney() + "万元", "#696969"));
+//                }
+//                param1.put("keyword3", new TemplateData(displaceAuditBean.getMoneyRange() + "万元", "#696969"));
+//                param1.put("keyword4", new TemplateData(DateUtil.format(startTime, "yyyy年MM月dd日 HH:mm"), "#696969"));
+//                param1.put("keyword5", new TemplateData(displaceAuditBean.getBail() + "万元", "#696969"));
+//                param1.put("remark", new TemplateData("点击【详情】前往查看！", "#696969"));
+//
+//                wxsms = wxsms.replaceAll("keyword1", wxnc);
+//			   /* pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "2",ConfigConstants.XXLB_SBSJ,
+//						appId, appSecret, sms, wxsms, param1, diggerUrl, "拍品上架通知");
+//				list.add(pushRecord);*/
+//                pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "1", ConfigConstants.XXLB_SBSJ,
+//                        appId, appSecret, sms, wxsms, param1, diggerUrl, "拍品上架通知");
+//                list.add(pushRecord);
+//            }
+//
+//            // 发送销售员信息
+//            if (StringUtils.isNotBlank(saleId)) {
+//                SalesBean salesBean = saleBeanService.getSaleBeanBySaleId(saleId);
+//                if (salesBean != null) {
+//                    String openId = salesBean.getWxOpenid();
+//                    String wxnc = salesBean.getSaleWxnc();
+//                    String wxh = salesBean.getSaleWxh();
+//                    String name = salesBean.getSaleName();
+//                    String phone = salesBean.getSalePhone();
+//                    String xqurl = "https://www.xxinjiyuan.com/wjj-api/index.html#/join?agentId=GZZSNJ&displaceId=GZZSNJ-ZH0044&status=finished&id=5c8adc199c7f44a8ac398d9edbcd4914";
+//                    // String saleUrl = TemplateConstants.ZHSH_SALE_URL + "?agentId=" + agentId + "&id=" + id;
+//                    String saleUrl = "https://www.weigongcheng.net/wjj-api/index.html#/join" + "?agentId=" + agentId + "&displaceId=" + displaceId + "&status=" + displaceAuditBean + "&id=" + id;
+//                    // 组装销售员微信内容
+//                    Map<String, TemplateData> param2 = new HashMap<String, TemplateData>();
+//                    param2.put("first", new TemplateData("您上传的设备已上架成功，等待买家出价", "#696969"));
+//                    param2.put("keyword1", new TemplateData(wxnc, "#696969"));
+//                    param2.put("keyword2", new TemplateData(sbmc, "#696969"));
+//                    param2.put("keyword3", new TemplateData(pubTimeStr, "#696969"));
+//                    param2.put("keyword4", new TemplateData("上架成功", "#696969"));
+//
+//                    String upsms = TemplateConstants.ZHSH_SALE_UP_SMS;
+//                    upsms = upsms.replace("sbmc", sbmc);
+//
+//                    String wxsms1 = TemplateConstants.ZHSH_SALE_TEMPLATE_CONTENT;
+//                    wxsms1 = wxsms1.replaceAll("first", "您上传的设备已上架成功，等待买家出价");
+//                    wxsms1 = wxsms1.replaceAll("keyword1", wxnc);
+//                    wxsms1 = wxsms1.replaceAll("keyword2", sbmc);
+//                    wxsms1 = wxsms1.replaceAll("keyword3", pubTimeStr);
+//                    wxsms1 = wxsms1.replaceAll("keyword4", "上架成功");
+//                    wxsms1 = wxsms1.replaceAll("remark", "赶快点击“详情”分享给大家吧！");
+//
+//					/*pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "2",ConfigConstants.XXLB_SBSJ,
+//							appId, appSecret, upsms, wxsms1, param2, saleUrl, "审核结果通知");
+//					list.add(pushRecord);*/
+//                    pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "1", ConfigConstants.XXLB_SBSJ,
+//                            appId, appSecret, upsms, wxsms1, param2, saleUrl, "审核结果通知");
+//                    list.add(pushRecord);
+//                }
+//            }
+//
+//            // 保存推送消息
+//            pushRecordBeanService.saveRecords(list);
+//        } catch (Exception e) {
+//            resultBean= new PageResultBean(PageResultBean.FAIL_CODE,"系统繁忙，请稍后再来！");
+//            log.error("addInfo error!",e);
+//        }finally{
+//
+//        }
+//
+//    }
+
+
+
+
+
+
 }

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

@@ -35,14 +35,16 @@ public interface DisplaceAuditMapper {
      * @param auditStatus 审核状态
      * @return 置换集合
      */
-    List<DisplaceListBo> selectDisplaceList(@Param("agentId") String agentId, @Param("openId") String openId, @Param("auditStatus") String auditStatus);
+    List<DisplaceListBo> selectDisplaceList(@Param("agentId") String agentId, @Param("openId") String openId, @Param("auditStatus") String auditStatus,@Param("is_good") String is_good);
     List<DisplaceListBo> selectDisplaceConfirmList(@Param("agentId") String agentId, @Param("openId") String openId, @Param("auditStatus") String auditStatus);
     List<DisplaceListBo> selectDisplaceOnList(@Param("agentId") String agentId, @Param("now") Date now, @Param("auditStatus") String auditStatus);
     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("now") Date now, @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,@Param("storage") String storage);
 
     /**
      * 查询置换详情
@@ -58,6 +60,8 @@ public interface DisplaceAuditMapper {
      */
     DisplaceAudit selectDisplaceAudit(String displaceId);
 
+    DisplaceAudit selectDisplaceAuditByDisplaceId(String displaceId);
+
     /**
      * 查询被驳回的置换设备数量
      * @param agentId 商家id

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,25 @@ public class DisplaceAudit extends BasePo {
 
     private int bill;
 
+    private String upType;
+
+    private String ids;
+
+    public String getIds() {
+        return ids;
+    }
+
+    public void setIds(String ids) {
+        this.ids = ids;
+    }
+
+    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

@@ -30,7 +30,7 @@ public interface DisplaceAuditService {
      * @param pageBean pageBean
      * @return 待审核的置换
      */
-    PageInfo<DisplaceListBo> queryUndoDisplaceList(String agentId, String openId, PageBean pageBean);
+    PageInfo<DisplaceListBo> queryUndoDisplaceList(String agentId, String openId, PageBean pageBean,String is_good);
 
     /**
      * 根据类型查询置换
@@ -46,6 +46,9 @@ public interface DisplaceAuditService {
 
     PageInfo<DisplaceListBo> getDisplaceConfirmList(String agentId, String openId, PageBean pageBean);
 
+    int updateByDisplaceId(String displaceId, String ifDeposit,String storage);
+
+
 
     /**
      * 查询已审核的置换
@@ -54,7 +57,7 @@ public interface DisplaceAuditService {
      * @param pageBean pageBean
      * @return 已审核的置换
      */
-    PageInfo<DisplaceListBo> queryDoneDisplaceList(String agentId, String openId, PageBean pageBean);
+    PageInfo<DisplaceListBo> queryDoneDisplaceList(String agentId, String openId, PageBean pageBean,String is_good);
 
     /**
      * 获取置换详情
@@ -70,6 +73,9 @@ public interface DisplaceAuditService {
      */
     DisplaceAudit getDisplaceAudit(String displaceId);
 
+    DisplaceAudit selectDisplaceAuditByDisplaceId(String displaceId);
+
+
     /**
      * 获取被驳回的置换设备数量
      * @param agentId 商家id

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) {
@@ -58,7 +62,7 @@ public class DisplaceAuditServiceImpl implements DisplaceAuditService {
 
     @ReadOnlyTransactional
     @Override
-    public PageInfo<DisplaceListBo> queryUndoDisplaceList(String agentId, String openId, PageBean pageBean) {
+    public PageInfo<DisplaceListBo> queryUndoDisplaceList(String agentId, String openId, PageBean pageBean,String is_good) {
         LOG.info("进入查询待审核的置换列表, agentId:{}, openId:{}, pageBean:{}", agentId, openId, pageBean);
         if (StringUtils.isBlank(agentId)) {
             LOG.info("agentId为空");
@@ -71,7 +75,7 @@ public class DisplaceAuditServiceImpl implements DisplaceAuditService {
         }
 
         PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize(), true);
-        List<DisplaceListBo> displaceListBos = displaceAuditMapper.selectDisplaceList(agentId, openId, DisplaceAudit.AUDIT_STATUS_UNDO);
+        List<DisplaceListBo> displaceListBos = displaceAuditMapper.selectDisplaceList(agentId, openId, DisplaceAudit.AUDIT_STATUS_UNDO,is_good);
         displaceAssemblyService.assembleListAttrContent(displaceListBos);
         LOG.info("退出查询待审核的列表");
         return new PageInfo<>(displaceListBos);
@@ -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, new Date(), 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,15 +153,20 @@ 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,String storage) {
+        return displaceAuditMapper.updateByDisplaceId(displaceId,ifDeposit,storage);
+    }
+
     @ReadOnlyTransactional
     @Override
-    public PageInfo<DisplaceListBo> queryDoneDisplaceList(String agentId, String openId, PageBean pageBean) {
+    public PageInfo<DisplaceListBo> queryDoneDisplaceList(String agentId, String openId, PageBean pageBean,String is_good) {
         LOG.info("进入查询已审核的置换列表, agentId:{}, openId:{}, pageBean:{}", agentId, openId, pageBean);
         if (StringUtils.isBlank(agentId)) {
             LOG.info("agentId为空");
@@ -163,7 +179,7 @@ public class DisplaceAuditServiceImpl implements DisplaceAuditService {
         }
 
         PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize(), true);
-        List<DisplaceListBo> displaceListBos = displaceAuditMapper.selectDisplaceList(agentId, openId, DisplaceAudit.AUDIT_STATUS_DONE);
+        List<DisplaceListBo> displaceListBos = displaceAuditMapper.selectDisplaceList(agentId, openId, DisplaceAudit.AUDIT_STATUS_DONE, is_good);
         displaceAssemblyService.assembleListAttrContent(displaceListBos);
         LOG.info("退出查询已审核的置换列表");
         return new PageInfo<>(displaceListBos);
@@ -211,6 +227,19 @@ public class DisplaceAuditServiceImpl implements DisplaceAuditService {
     }
 
     @Override
+    public DisplaceAudit selectDisplaceAuditByDisplaceId(String displaceId) {
+        LOG.info("调用获取置换审核, displaceId:{}", displaceId);
+        if (StringUtils.isBlank(displaceId)) {
+            LOG.info("displaceId为空");
+            return null;
+        }
+
+        DisplaceAudit displaceAudit = displaceAuditMapper.selectDisplaceAudit(displaceId);
+        LOG.info("退出获取置换审核, displaceAudit:{}", displaceAudit);
+        return displaceAudit;
+    }
+
+    @Override
     public int getRejectedDisplaceCount(String agentId, String openId) {
         LOG.info("进入查询被驳回的置换设备数量, agentId:{}, openId:{}", agentId, openId);
 

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,17 @@ public class OfferServiceImpl implements OfferService {
             newEndTime.add(Calendar.SECOND, delay);
             displaceAuditService.updateEndTime(displaceAudit.getId(), newEndTime.getTime());
         }
+        //精品机一口价成交处理
+        LOG.info("displaceAudit.getIs_good()="+displaceAudit.getIs_good());
+        LOG.info("displaceAudit.getUpType()="+displaceAudit.getUpType());
+        LOG.info("displaceAudit.getPersist_price()="+displaceAudit.getPersist_price());
+        LOG.info("diggerOfferSaveBo.getPrice()="+diggerOfferSaveBo.getPrice());
+        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) {
@@ -85,7 +88,6 @@ public class PayServiceImpl implements PayService {
                     .setExecuteResult(false)
                     .setResult(Result.Failure);
         }
-
         String openId = createOrderBo.getOpenId();
         if (StringUtils.isBlank(openId)) {
             LOG.warn("微信openId为空");
@@ -265,7 +267,6 @@ public class PayServiceImpl implements PayService {
         // 默认不是通票, 通票是不需要支付保证金
         newDeposit.setIsCommon("0");
         depositService.save(newDeposit);
-
         CreateOrderResult createOrderResult = new CreateOrderResult();
         createOrderResult.setAppId(appId);
         createOrderResult.setTimeStamp(String.valueOf(System.currentTimeMillis() / 1000));
@@ -468,7 +469,8 @@ public class PayServiceImpl implements PayService {
             } else {
                 weiXinPayService.updateOrderStatus(weiXinPay.getId(), WeiXinPay.ORDER_STATUS_SUCCESS);
                 depositService.updatePayStatus(weiXinPay.getOrderNo(), transactionId, "1");
-
+                LOG.info("更新是否支付保证金="+weiXinPay.getProductId());
+                displaceAuditService.updateByDisplaceId(weiXinPay.getProductId(),"2","1");
                 PayParameterJson payParameterJson = JSON.parseObject(weiXinPay.getParameterJson(), PayParameterJson.class);
 
                 saveDisplaceOffUser(weiXinPay, payParameterJson);

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

@@ -2,10 +2,8 @@ package com.demo.wjj.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.demo.wjj.bo.*;
-import com.demo.wjj.po.Agent;
-import com.demo.wjj.po.Deposit;
-import com.demo.wjj.po.DiggerAgent;
-import com.demo.wjj.po.WeiXinPay;
+import com.demo.wjj.mapper.ExplainMapper;
+import com.demo.wjj.po.*;
 import com.demo.wjj.service.*;
 import com.demo.wjj.utils.*;
 import com.sun.xml.internal.messaging.saaj.util.ByteInputStream;
@@ -54,6 +52,8 @@ public class PayforServiceImpl implements PayforService{
      */
     @Value("${weixin.pay.apiAddress}")
     private String payApiAddress;
+    @Value("${jpjgh}")
+    private String jpjgh;
     @Autowired
     private DiggerAgentService diggerAgentService;
     @Autowired
@@ -65,6 +65,12 @@ public class PayforServiceImpl implements PayforService{
     @Autowired
     private DepositService depositService;
 
+    @Autowired
+    DisplaceAuditService displaceAuditService;
+
+    @Autowired
+    ExplainMapper explainMapper;
+
 
 
     @Override
@@ -132,7 +138,13 @@ public class PayforServiceImpl implements PayforService{
                     .setExecuteResult(false)
                     .setResult(Result.NO_AUTHORITY);
         }
-        Integer deposit = creditsExchangeService.selectByUserId(agentId).getCashDiposit()*100;
+        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();
         orderParameter.setAppId(appId);
         orderParameter.setMchId(mchId);
@@ -407,6 +419,8 @@ 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/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},storage=#{storage}
+        WHERE displace_id = #{displaceId}
+    </update>
+
     <!--更新报价结束时间-->
     <update id="updateEndTime">
         UPDATE tb_displace_audit SET end_time = #{endTime} WHERE id = #{id}
@@ -47,27 +53,35 @@
         </if>
         <if test="auditStatus == 1">
             a.audit_status IN ('1', '3')
+            <if test="is_good == 2">
+                AND   a.if_deposit='2'
+            </if>
+            <if test="is_good == 1">
+                AND   a.if_deposit='1'
+            </if>
         </if>
+        AND a.is_good=#{is_good}
         AND a.agent_id = #{agentId} AND s.agent_id = #{agentId} AND s.wx_openid = #{openId}
         AND a.state = '1'
+
         ORDER BY a.displace_id DESC
     </select>
 
 
     <!--查询待确认-->
     <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 +100,21 @@
         <result column="end_time" property="endTime"/>
         <result column="time_delay" property="timeDelay"/>
         <result column="min_money" property="minMoney"/>
+        <result column="up_type" property="upType"/>
+        <result column="sale_id" property="saleId"/>
+        <result column="ids" property="ids"/>
+        <result column="is_good" property="is_good"/>
     </resultMap>
 
+    <select id="selectDisplaceAuditByDisplaceId" 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,a.up_type,a.is_good,a.ids
+        FROM tb_displace_audit a
+        WHERE a.state = '1' AND a.displace_id = #{displaceId}
+    </select>
+
     <!--查询置换审核-->
     <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,a.is_good
         FROM tb_displace_audit a
         WHERE a.state = '1' AND a.displace_id = #{displaceId}
     </select>
@@ -114,6 +138,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,22 +155,22 @@
         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>
 
     <!--停售设备-->
     <select id="selectDisplaceHaltList" 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(b.offer_times, 0) offerTimes, a.first_pic_url picUrl, a.start_time , a.end_time startTime, IFNULL(b.max_offer, a.min_money) currentPrice,a.storage,a.is_good,a.min_price,a.max_price,a.persist_price
-        FROM tb_displace_audit a left JOIN tb_offer b ON b.displace_id=a.displace_id
+        SELECT a.id,a.is_kxc isKxc, a.up_type upType, a.displace_id displaceId, IFNULL(a.look_times, 0) lookTimes, IFNULL(b.offer_times, 0) offerTimes,a.first_pic_url picUrl, a.start_time , a.end_time startTime, IFNULL(b.max_offer, a.min_money) currentPrice,a.storage,a.is_good,a.min_price,a.max_price,a.persist_price
+        FROM tb_displace_audit a left JOIN agent.tb_offer b ON b.displace_id=a.displace_id
         WHERE
         a.audit_status IN ('1', '3')
         AND  #{now} > a.end_time
         AND a.agent_id = #{agentId}
         AND a.state = '1'
-        AND b.offer_times = 0
-        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 +193,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'  AND  #{now} > a.end_time
+        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

wjj-core/src/test/java/com/demo/wjj/service/DisplaceAuditServiceTest.java

@@ -17,25 +17,25 @@ public class DisplaceAuditServiceTest extends BaseTest {
     @Autowired
     private DisplaceAuditService displaceAuditService;
 
-    @Ignore
-    @Test
-    public void queryUndoDisplaceList() {
-        PageBean pageBean = new PageBean();
-        pageBean.setPageSize(15);
-        pageBean.setPageNum(1);
-        PageInfo<DisplaceListBo> pageInfo = displaceAuditService.queryUndoDisplaceList("aaabbb", "oUpF8uMuAJO_M2pxb1Q9zNjWeS6o", pageBean);
-        System.out.println(JSON.toJSON(pageInfo));
-    }
-
-    @Ignore
-    @Test
-    public void queryDoneDisplaceList() {
-        PageBean pageBean = new PageBean();
-        pageBean.setPageSize(15);
-        pageBean.setPageNum(1);
-        PageInfo<DisplaceListBo> pageInfo = displaceAuditService.queryDoneDisplaceList("aaabbb", "oUpF8uMuAJO_M2pxb1Q9zNjWeS6o", pageBean);
-        System.out.println(JSON.toJSON(pageInfo));
-    }
+//    @Ignore
+//    @Test
+//    public void queryUndoDisplaceList() {
+//        PageBean pageBean = new PageBean();
+//        pageBean.setPageSize(15);
+//        pageBean.setPageNum(1);
+//        PageInfo<DisplaceListBo> pageInfo = displaceAuditService.queryUndoDisplaceList("aaabbb", "oUpF8uMuAJO_M2pxb1Q9zNjWeS6o", pageBean);
+//        System.out.println(JSON.toJSON(pageInfo));
+//    }
+//
+//    @Ignore
+//    @Test
+//    public void queryDoneDisplaceList() {
+//        PageBean pageBean = new PageBean();
+//        pageBean.setPageSize(15);
+//        pageBean.setPageNum(1);
+//        PageInfo<DisplaceListBo> pageInfo = displaceAuditService.queryDoneDisplaceList("aaabbb", "oUpF8uMuAJO_M2pxb1Q9zNjWeS6o", pageBean);
+//        System.out.println(JSON.toJSON(pageInfo));
+//    }
 
     @Test
     public void getDisplaceDetail() {