8小时后台--

保单增员支付

src/main/java/cn/timer/api/bean/insure/InsurePay.java

@@ -73,6 +73,8 @@ public class InsurePay extends Model<InsurePay> {
 
 	private String serialNumber;
 
+	private String payUrl;
+
 	/**
 	 * 设置：id
 	 */

src/main/java/cn/timer/api/controller/insure/CallBackContorll.java

@@ -3,6 +3,7 @@ package cn.timer.api.controller.insure;
 import cn.timer.api.bean.insure.*;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.utils.HttpUtils;
+import cn.timer.api.utils.ResultUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -10,6 +11,7 @@ import com.google.common.collect.Maps;
 import com.mysql.cj.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,6 +54,10 @@ public class CallBackContorll {
     @Value("${BASE_API_URL}")
     private String base_api_url;
 
+    /*保全支付*/
+    @Value("${insure.batchToPayUrl}")
+    private String batchToPayUrl;
+
 
     private Map setParams(String sign, String appid, String secret) {
         /*当前时间戳*/
@@ -103,8 +109,81 @@ public class CallBackContorll {
         return trueMap;
     }
 
+    @PostMapping(value = "/addpPayCallBack")
+    @ApiOperation(value = "11.增员核保回调", httpMethod = "POST", notes = "增员核保回调")
+    private Map addpPayCallBack(HttpServletRequest request, @RequestParam String pid, @RequestParam String sign, @RequestParam String timestamp) throws IOException {
+        /*核保*/
+        /*如果是在线支付的话*/
+        Map map = Maps.newHashMap();
+        map.put("status", "error");
+        if (StringUtils.isNullOrEmpty(pid) || StringUtils.isNullOrEmpty(sign) && StringUtils.isNullOrEmpty(timestamp)) {
+            return map;
+        }
+        if (!pid.equals(appidq)) {
+            return map;
+        }
+        InputStream is = null;
+        is = request.getInputStream();
+        StringBuilder sb = new StringBuilder();
+        byte[] b = new byte[4096];
+        for (int n; (n = is.read(b)) != -1; ) {
+            sb.append(new String(b, 0, n));
+        }
+        String value = DigestUtils.md5Hex(appidq + secretq + timestamp + sb.toString());
+        if (!value.equals(sign)) {
+            return map;
+        }
+        CallBack callBack = JSONObject.parseObject(sb.toString(), CallBack.class);
+        if(callBack.getCallback_type().equals("1")) {
+            List<InsureUser> insureUserList = InsureUser.builder().build().selectList(new QueryWrapper<InsureUser>().lambda().eq(InsureUser::getBatchNo, callBack.getOrder_import_info().getUuid()));
+            InsurePolicy insurePolicy = InsurePolicy.builder().id(insureUserList.get(0).getPolicyId()).build().selectById();
+            if(callBack.getStatus().equals("1")) {
+                if (insureUserList.size() > 0) {
+                    insurePolicy.setStatus("4");/*设置为支付状态*/
+                    insurePolicy.setUpdateTime(new Date());
+                    InsurePay insurePay=   InsurePay.builder().payStatus(1).
+                            serialNumber(callBack.getOrder_import_info().getUuid()).policyId(insurePolicy.getId()).build();
+                    insurePay.insert();
+                    insurePolicy.setPayId(insurePay.getId());
+                    insurePolicy.updateById();
+
+                }
+             InsureLog.builder().type(7)
+                        .requestData(sb.toString()).createTime(new Date()).requestType(1).returnBody(JSONObject.toJSONString(callBack)).requestPath(base_api_url + "/callBack/policy/addpPayCallBack")
+                        .returnCode(callBack.getStatus()).returnMsg("核保通过").policyId(insurePolicy.getId()).build();
+
+
+            }else{
+                insureUserList.stream().forEach(v->{
+                    v.setStatus("2");
+                    v.setInsureStatus(2);
+                    v.updateById();
+                });
+                insurePolicy.setStatus("1");
+                insurePolicy.updateById();
+                List<Map> errMap = callBack.getOrder_import_info().getErr_list();
+                String errorMsg="";
+                if (errMap.size() > 0) {
+                    for (int i = 0; i < errMap.size(); i++) {
+                        errorMsg = errorMsg + ("姓名：" + errMap.get(i).get("name").toString() + "，错误：" + errMap.get(i).get("err_content").toString() + ',');
+                    }
+                } else {
+                    errorMsg = callBack.getErr_msg();
+                }
+                //TODO 写入日志
+                InsureLog.builder().type(7)
+                        .requestData(sb.toString()).createTime(new Date()).requestType(1).returnBody(JSONObject.toJSONString(callBack)).requestPath(base_api_url + "/callBack/policy/addpPayCallBack")
+                        .returnCode(callBack.getStatus()).returnMsg(errorMsg).policyId(insurePolicy.getId()).build().insert();
+            }
+        }
+        Map trueMap = Maps.newHashMap();
+        trueMap.put("status", "1");
+        return trueMap;
+    }
+
     @PostMapping(value = "/CallBack")
     @ApiOperation(value = "7.保全增员申请回调", httpMethod = "POST", notes = "投保申请回调")
+    @ApiOperationSupport(order = 2)
     private Map callBack(HttpServletRequest request, @RequestParam String pid, @RequestParam String sign, @RequestParam String timestamp) throws IOException {
         Map map = Maps.newHashMap();
         map.put("status", "error");
@@ -130,12 +209,6 @@ public class CallBackContorll {
         paramsMap.put("timestamp", timestamp);
         paramsMap.put("sign", sign);
         CallBack callBack = JSONObject.parseObject(sb.toString(), CallBack.class);
-        /*1保全复核回调*/
-        if (callBack.getCallback_type().equals("1")) {
-            /*核保*/
-        } else {
-
-            /*到这就已经支付成功出单了*/
         log.info("callBack=====" + sb.toString());
         if (callBack.getStatus().equals("1")) {
             List<InsureUser> list = InsureUser.builder().build().selectList(new QueryWrapper<InsureUser>().lambda().eq(InsureUser::getBatchNo, callBack.getOrder_import_info().getUuid()).eq(InsureUser::getInsureStatus, 3));
@@ -159,6 +232,7 @@ public class CallBackContorll {
             }
             insurePolicy.setPolicyFile(callBack.getOrder_import_info().getEndorsement_file());
             insurePolicy.setUpdateTime(new Date());
+            insurePolicy.setStatus("1");
             insurePolicy.updateById();
             InsureLog.builder().requestParam(JSONObject.toJSONString(paramsMap)).type(7)
                     .requestData(sb.toString()).createTime(new Date()).requestType(1).returnBody(JSONObject.toJSONString(callBack)).requestPath(base_api_url + "/callBack/policy/CallBack")
@@ -179,8 +253,6 @@ public class CallBackContorll {
                     .requestData(sb.toString()).createTime(new Date()).requestType(1).returnBody(JSONObject.toJSONString(callBack)).requestPath(base_api_url + "/callBack/policy/CallBack")
                     .returnCode(callBack.getStatus()).returnMsg(errorMsg).policyId(insureLog.getPolicyId()).build().insert();
         }
-
-        }
         Map trueMap = Maps.newHashMap();
         trueMap.put("status", "1");
 
@@ -292,9 +364,9 @@ public class CallBackContorll {
                 u.setInsureStatus(2);
                 u.updateById();
             });
+        }
         insurePolicy.updateById();
         insurePay.updateById();
-        }
         InsureLog.builder().type(7).createTime(new Date()).requestType(1).returnBody(sb.toString()).requestPath(getPolicyUrl)
                 .returnCode(callBack.getStatus()).policyId(insurePay.getPolicyId()).returnMsg(callBack.getErr_msg()).build().insert();
         return map;

src/main/java/cn/timer/api/controller/qyzx/QyzxController.java

@@ -657,10 +657,10 @@ public class QyzxController {
 	 */
 	@PostMapping(value = "/companyAdminList")
 	@ApiOperation(value = "运营后台---企业信息列表", httpMethod = "POST", notes = "")
-	public Result<Object> companyAdminList(@RequestBody cn.timer.api.utils.Page page) {
+	public Result<Object> companyAdminList(@RequestBody EntInfoDto entInfoDto) {
 		Map map = Maps.newHashMap();
-		List<EntInfoDto> list = Optional.ofNullable(qyzxEntInfoMMapper.companyAdminList(page)).orElse(Lists.newArrayList());
-		Integer count = qyzxEntInfoMMapper.companyAdminCount();
+		List<EntInfoDto> list = Optional.ofNullable(qyzxEntInfoMMapper.companyAdminList(entInfoDto)).orElse(Lists.newArrayList());
+		Integer count = qyzxEntInfoMMapper.companyAdminCount(entInfoDto);
 		map.put("list",list);
 		map.put("count",count);
 		return ResultUtil.data(map);

src/main/java/cn/timer/api/dao/qyzx/QyzxEntInfoMMapper.java

@@ -18,9 +18,9 @@ import java.util.Map;
 */
 @Repository
 public interface QyzxEntInfoMMapper extends BaseMapper<QyzxEntInfoM> {
-    public List<EntInfoDto> companyAdminList(@Param("page")Page page);
+    public List<EntInfoDto> companyAdminList(@Param("param")EntInfoDto entInfoDto);
 
-    public Integer companyAdminCount();
+    public Integer companyAdminCount(@Param("param")EntInfoDto entInfoDto);
 
     public List<Map<String,String>> getCompanyList();
 

src/main/java/cn/timer/api/dto/qyzx/EntInfoDto.java

 package cn.timer.api.dto.qyzx;
 
+import cn.timer.api.utils.Page;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,4 +27,5 @@ public class EntInfoDto {
     private String endTime;
     private Integer totlaSpmk;
     private Integer totlaCc;
+    private Page page;
 }

src/main/resources/mapping/insure/InsurePayMapper.xml

@@ -14,6 +14,7 @@
         <result property="payType" column="pay_type"/>
         <result property="policyId" column="policy_id"/>
         <result property="serialNumber" column="serial_number"/>
+        <result property="payUrl" column="pay_url"/>
 
     </resultMap>
 

src/main/resources/mapping/qyzx/QyzxEntInfoMMapper.xml

@@ -217,10 +217,21 @@
         LEFT JOIN yggl_main_emp yme ON yme.org_code = qeim.id
         LEFT JOIN ( SELECT sas.org_code AS oid, count( sas.id ) AS totlaSpmk FROM spmk_approve_summary sas GROUP BY sas.org_code ) AS a ON a.oid = qeim.id
         LEFT JOIN ( SELECT cc.organization_id AS oid, count( cc.id ) AS totlaCc FROM cms_content cc GROUP BY cc.organization_id ) AS b ON b.oid = qeim.id
+        <where>
+            <if test="param.name != null and param.name !=''">
+                and qeim.NAME like CONCAT('%',#{name},'%')
+            </if>
+            <if test="param.linkMan != null and param.linkMan !=''">
+                and qeim.link_man like CONCAT('%',#{linkMan},'%')
+            </if>
+            <if test="param.linkManPhone != null and param.linkManPhone !=''">
+                and qeim.phone like CONCAT('%',#{linkManPhone},'%')
+            </if>
+        </where>
         GROUP BY
         qeim.id
-        <if test="page.offset != null and page.totalPage !=null">
-            limit #{page.offset},#{page.totalPage}
+        <if test="param.page.offset != null and param.page.totalPage !=null">
+            limit #{param.page.offset},#{param.page.totalPage}
         </if>
     </select>