二次销售竞价移动端

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/LoanSecondarySalesBiddingFeign.java

@@ -1,6 +1,8 @@
 package com.yxt.anrui.riskcenter.api.loansecondarysalesbidding;
 
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,4 +35,8 @@ public interface LoanSecondarySalesBiddingFeign {
     @ApiOperation("当前竞价最高")
     @GetMapping("/getPrice")
     ResultBean<String> getPrice(@RequestParam("sid") String sid);
+
+    @ApiOperation("竞价列表")
+    @GetMapping("/getBiddingList")
+    ResultBean<SalesBiddingVo> getBiddingList(@RequestParam("sid") String sid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/SalesBiddingVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesbidding;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/5
+ **/
+@Data
+public class SalesBiddingVo {
+
+    private String vinNo;
+
+    private List<BiddingVo> biddingList = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java

@@ -484,12 +484,12 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                 //推公告
                 PushNoticeQuery pushNoticeQuery = new PushNoticeQuery();
                 pushNoticeQuery.setApp_type("2");
-                pushNoticeQuery.setModuleAction("com.anrui.android.plugin.riskcontrol.activity.DetailCarSecondSaleActivity");
+                pushNoticeQuery.setModuleAction("com.anrui.android.plugin.riskcontrol.activity.DetailCarSecondSaleBiddingActivity");
                 pushNoticeQuery.setUserSid(bv.getUserSid());
                 pushNoticeQuery.setModuleSid("fec4e243-491a-11ec-94cd-fa163e0cb33c");
                 pushNoticeQuery.setSid(businessSid);
                 pushNoticeQuery.setCreateTime(DateUtil.today());
-                pushNoticeQuery.setPcUrl("riskcenter/#/notificationannouncement/relation/secondarysaleannouncement");
+                pushNoticeQuery.setPcUrl("#/notificationannouncement/relation/secondarysaleannouncement");
                 DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                 String closeDates = "";
                 try {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.java

@@ -21,4 +21,6 @@ public interface LoanSecondarySalesBiddingMapper extends BaseMapper<LoanSecondar
     List<BiddingVo> getList(String sid);
 
     String getPrice(String sid);
+
+    String getVinNo(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.xml

@@ -24,4 +24,13 @@
         order by price desc
         limit 1
     </select>
+
+    <select id="getVinNo" resultType="java.lang.String">
+        select ss.vinNo
+        from loan_secondary_sales_apply la
+                 left join (select group_concat(lv.vinNo) as vinNo, group_concat(lv.vehMark) as vehmark, lv.mainSid
+                            from loan_secondary_sales_veh lv
+                            group by lv.mainSid) ss on ss.mainSid = la.sid
+        where la.sid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingRest.java

@@ -3,7 +3,10 @@ package com.yxt.anrui.riskcenter.biz.loansecondarysalesbidding;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.BiddingVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBiddingDto;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBiddingFeign;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.SalesBiddingVo;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,4 +41,11 @@ public class LoanSecondarySalesBiddingRest implements LoanSecondarySalesBiddingF
     public ResultBean<String> getPrice(String sid) {
         return loanSecondarySalesBiddingService.getPrice(sid);
     }
+
+    @Override
+    public ResultBean<SalesBiddingVo> getBiddingList(String sid) {
+        return loanSecondarySalesBiddingService.getBiddingList(sid);
+    }
+
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java

@@ -1,5 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loansecondarysalesbidding;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -8,9 +10,13 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.BiddingVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBidding;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBiddingDto;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.SalesBiddingVo;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,7 +46,7 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService<LoanSec
         loanSecondarySalesBidding.setMainSid(dto.getMainSid());
         loanSecondarySalesBidding.setOrgSidPath(dto.getOrgPath());
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
-        if ("0".equals(useOrgSid)) {
+        if ("0".equals(useOrgSid) || StringUtils.isBlank(useOrgSid)) {
             return rb.setMsg("您所在机构没有分公司，不允许竞价");
         }
         loanSecondarySalesBidding.setUseOrgSid(useOrgSid);
@@ -60,7 +66,8 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService<LoanSec
         if (loanSecondarySalesBidding1 != null) {
             if (StringUtils.isNotBlank(dto.getPrice())) {
                 if ((new BigDecimal(dto.getPrice()).subtract(loanSecondarySalesBidding1.getPrice()).compareTo(new BigDecimal("1000"))) < 0) {
-                    return rb.setMsg("确认失败，每次竞价幅度需不低于1000元");
+                    BigDecimal all = loanSecondarySalesBidding1.getPrice().add(new BigDecimal("1000"));
+                    return rb.setMsg("您的报价不能低于" + all.toString() + "元");
                 }
                 loanSecondarySalesBidding.setPrice(new BigDecimal(dto.getPrice()));
             } else {
@@ -86,4 +93,15 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService<LoanSec
         String price = baseMapper.getPrice(sid);
         return rb.success().setData(price);
     }
+
+    public ResultBean<SalesBiddingVo> getBiddingList(String sid) {
+        ResultBean<SalesBiddingVo> rb = ResultBean.fireFail();
+        SalesBiddingVo salesBiddingVo = new SalesBiddingVo();
+        List<BiddingVo> list = baseMapper.getList(sid);
+        list.removeAll(Collections.singleton(null));
+        salesBiddingVo.setBiddingList(list);
+        String vinNo = baseMapper.getVinNo(sid);
+        salesBiddingVo.setVinNo(vinNo);
+        return rb.success().setData(salesBiddingVo);
+    }
 }