投保

sql/V2.3.sql

@@ -37,3 +37,10 @@ CREATE TABLE ` yggl_main_importLog `  (
 
 ALTER TABLE `timer_test`.`insure_user`
 MODIFY COLUMN `apply_type` int(11) NULL DEFAULT NULL COMMENT '申请类型：1新增 2投保 3批改' AFTER `replace_trans_id`;
+
+ALTER TABLE `timer_test`.`insure_applicant`
+ADD COLUMN `appid` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `applicantephone`,
+ADD COLUMN `secret` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `appid`,
+ADD COLUMN `appidq` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `secret`,
+ADD COLUMN `secretq` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `appidq`;
+

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

@@ -134,6 +134,14 @@ public class InsureApplicant extends Model<InsureApplicant> {
     private Integer orgCode;
     @ApiModelProperty(value = "银行账号")
     private String applicantCorporateBankAccount;
+    @ApiModelProperty(value = "投保appid")
+    private String appid;
+    @ApiModelProperty(value = "投保secret")
+    private String secret;
+    @ApiModelProperty(value = "投保全appid")
+    private String appidq;
+    @ApiModelProperty(value = "保全secret")
+    private String secretq;
 
     /**
      * 设置：id

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

@@ -126,5 +126,7 @@ public class InsurePolicy extends Model<InsurePolicy> {
 	 */
 	private Integer payId;
 
+	private String serialNumber;
+
 
 }

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

@@ -31,17 +31,6 @@ public class InsurePayController{
 	@Autowired
 	private InsureUserMapper insureUserMapper;
 
-	@Value("${insure.appid}")
-	private String appid;
-	@Value("${insure.secret}")
-	private String secret;
-	@Value("${insure.appidq}")
-	private String appidq;
-	@Value("${insure.secretq}")
-	private String secretq;
-	/*投保支付*/
-	@Value("${insure.toPayUrl}")
-	private String toPayUrl;
 
 	@GetMapping(value = "/cancelPayment")
 	@ApiOperation(value = "取消支付", httpMethod = "GET", notes = "取消支付")

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

@@ -65,6 +65,13 @@ public class InsurePlanController {
         }
         return ResultUtil.error("保存失败");
     }
-
-    ;
+    @PostMapping(value = "/deletePlan")
+    @ApiOperation(value = "删除产品方案", httpMethod = "POST", notes = "删除产品方案")
+    public Result<Object> deletePlan(@RequestBody InsureProductPlan insureProductPlan) {
+        insureProductPlan.setDeleteFlag(1);
+        if (insureProductPlan.updateById()) {
+            return ResultUtil.data("删除产品方案成功");
+        }
+        return ResultUtil.error("添加产品失败");
+    }
 }

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

@@ -52,5 +52,4 @@ public class InsureProductController {
         return ResultUtil.error("添加产品失败");
     }
 
-    ;
 }

src/main/resources/application-dev.yml

@@ -283,9 +283,9 @@ h5:
   url: 'http://javays.com'
 insure:
     #投保 appid
-    appid:  '1002303100602312445'
-    #投保 secret
-    secret: 'acb329868c31d5b3ba03de40dac13dd9'
+#    appid:  '1002305000010094276'
+#    #投保 secret
+#    secret: '51e405c74bd9514e1955a92520786286'
     #投保上传文件
     uploadUrl:  'http://sandbox.portal.unistar-ins.com/service/Home/Index/fileUpload'
     #投保立即出单
@@ -300,11 +300,13 @@ insure:
     toPayUrl: 'http://sandbox.portal.unistar-ins.com/mall/Home/Pay/toPay'
   #保全支付
     batchToPayUrl: 'http://sandbox.portal.unistar-ins.com/fuli/Home/ImportPay/set_import_pay'
+  #预付款出单接口
+    issue: 'http://sandbox.portal.unistar-ins.com/cps/Labor/Policy/issue'
 
   #保全appid
-    appidq: '1000115041006006938'
-  #保全 secret
-    secretq:  '6ba1bf4aa0bd14368c95ff0b9934a17b'
+#    appidq: '1000115041006006938'
+#  #保全 secret
+#    secretq:  '6ba1bf4aa0bd14368c95ff0b9934a17b'
   #保全上传文件
     uploadUrlq: 'http://sandbox.portal.unistar-ins.com/fuli/Home/Index/file_upload'
   #保全申请
@@ -313,7 +315,7 @@ insure:
     cancelPayment: 'http://sandbox.portal.unistar-ins.com/fuli/Home/OrderImport/order_import_set'
 
 # base_api_url
-BASE_API_URL: 'http://o49t563035.qicp.vip'
+BASE_API_URL: 'https://u495v63035.oicp.vip'
 
 #支付回调
 pay_page: 'http://localhost:9527'

src/main/resources/application-test.yml

@@ -254,10 +254,10 @@ wxgzh:
   encodingAesKey: 'chAbt69dLAtk8HH0oGMuZwHzK2SuhnxZI5Jbzc4nNzX'
 
 insure:
-  #投保 appid
-  appid:  '1002303100602312445'
-  #投保 secret
-  secret: 'acb329868c31d5b3ba03de40dac13dd9'
+#  #投保 appid
+#  appid:  '1002303100602312445'
+#  #投保 secret
+#  secret: 'acb329868c31d5b3ba03de40dac13dd9'
   #投保上传文件
   uploadUrl:  'http://sandbox.portal.unistar-ins.com/service/Home/Index/fileUpload'
   #投保立即出单
@@ -272,11 +272,13 @@ insure:
   toPayUrl: 'http://sandbox.portal.unistar-ins.com/mall/Home/Pay/toPay'
   #保全支付
   batchToPayUrl: 'http://sandbox.portal.unistar-ins.com/fuli/Home/ImportPay/set_import_pay'
+  #预付款出单接口
+  issue: 'http://sandbox.portal.unistar-ins.com/cps/Labor/Policy/issue'
 
-  #保全appid
-  appidq: '1000115041006006938'
-  #保全 secret
-  secretq:  '6ba1bf4aa0bd14368c95ff0b9934a17b'
+#  #保全appid
+#  appidq: '1000115041006006938'
+#  #保全 secret
+#  secretq:  '6ba1bf4aa0bd14368c95ff0b9934a17b'
   #保全上传文件
   uploadUrlq: 'http://sandbox.portal.unistar-ins.com/fuli/Home/Index/file_upload'
   #保全申请

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

@@ -24,6 +24,10 @@
         <result property="currency" column="currency"/>
         <result property="applicantInvoicedAmount" column="applicant_invoiced_amount"/>
         <result property="applicantCorporateBankAccount" column="applicant_corporate_bank_account"/>
+        <result property="appid" column="appid"/>
+        <result property="secret" column="secret"/>
+        <result property="appidq" column="appidq"/>
+        <result property="secretq" column="secretq"/>
     </resultMap>
 
     <select id="queryObject" resultType="cn.timer.api.bean.insure.InsureApplicant">
@@ -147,7 +151,11 @@
          `trans_id`,
          `currency`,
          `applicant_invoiced_amount`,
-         `applicant_corporate_bank_account`)
+         `applicant_corporate_bank_account`,
+         `appid`,
+         `secret`,
+         `appidq`,
+         `secretq`)
         values (#{applicantEName},
                 #{applicantEAddress},
                 #{applicantEmployeeList},
@@ -164,7 +172,11 @@
                 #{applicantType},
                 #{transId},
                 #{currency},
-                #{applicantCorporateBankAccount})
+                #{applicantCorporateBankAccount},
+                #{appid},
+                #{secret},
+                #{appidq},
+                #{secretq})
     </insert>
 
     <insert id="saveSelective" parameterType="cn.timer.api.bean.insure.InsureApplicant" useGeneratedKeys="true"
@@ -189,6 +201,10 @@
         <if test="currency != null">,`currency`</if>
         <if test="applicantInvoicedAmount != null">,`applicant_invoiced_amount`</if>
         <if test="applicantCorporateBankAccount != null">,`applicant_corporate_bank_account`</if>
+        <if test="appid != null">,`appid`</if>
+        <if test="secret != null">,`secret`</if>
+        <if test="appidq != null">,`appidq`</if>
+        <if test="secretq != null">,`secretq`</if>
         )
         values
         (
@@ -209,6 +225,10 @@
         <if test="transId != null">,#{transId}</if>
         <if test="currency != null">,#{currency}</if>
         <if test="applicantCorporateBankAccount != null">,#{applicantCorporateBankAccount}</if>
+        <if test="appid != null">,#{appid}</if>
+        <if test="secret != null">,#{secret}</if>
+        <if test="appidq != null">,#{appidq}</if>
+        <if test="secretq != null">,#{secretq}</if>
         )
     </insert>
 
@@ -233,7 +253,11 @@
         `applicant_type`,
         `trans_id`,
         `currency`,
-        `applicant_invoiced_amount`
+        `applicant_invoiced_amount`,
+         `appid`,
+         `secret`,
+        `appidq`,
+        `secretq`
         )
         values
         <foreach collection="list" item="item" index="index" separator=",">
@@ -254,7 +278,11 @@
             #{item.applicantType},
             #{item.transId},
             #{item.currency},
-            #{item.applicantInvoicedAmount}
+            #{item.applicantInvoicedAmount},
+            #{item.appid},
+            #{item.secret},
+            #{item.appidq},
+            #{item.secretq}
             )
         </foreach>
     </insert>

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

@@ -25,6 +25,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="policyPayType" column="policy_pay_type"/>
         <result property="payId" column="pa_id"/>
+        <result property="serialNumber" column="serial_number"/>
     </resultMap>
 
     <select id="queryObject" resultType="cn.timer.api.bean.insure.InsurePolicy">
@@ -56,6 +57,7 @@
             <if test="orgCode != null and orgCode != ''">AND `org_code` = #{orgCode}</if>
             <if test="createTime != null and createTime != ''">AND `create_time` = #{createTime}</if>
             <if test="updateTime != null and updateTime != ''">AND `update_time` = #{updateTime}</if>
+            <if test="serialNumber != null and serialNumber != ''">AND `serial_number` = #{serialNumber}</if>
         </where>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -93,6 +95,7 @@
             <if test="orgCode != null and orgCode != ''">AND `org_code` = #{orgCode}</if>
             <if test="createTime != null and createTime != ''">AND `create_time` = #{createTime}</if>
             <if test="updateTime != null and updateTime != ''">AND `update_time` = #{updateTime}</if>
+            <if test="serialNumber != null and serialNumber != ''">AND `serial_number` = #{serialNumber}</if>
         </where>
     </select>
 
@@ -114,7 +117,8 @@
          `insure_applicant_id`,
          `org_code`,
          `create_time`,
-         `update_time`)
+         `update_time`,
+         `serial_number`)
         values (#{schemeName},
                 #{policyDateStart},
                 #{policyDateEnd},
@@ -131,7 +135,8 @@
                 #{insureApplicantId},
                 #{orgCode},
                 #{createTime},
-                #{updateTime})
+                #{updateTime},
+                #{serialNumber})
     </insert>
 
     <insert id="saveSelective" parameterType="cn.timer.api.bean.insure.InsurePolicy" useGeneratedKeys="true"
@@ -155,6 +160,7 @@
         <if test="orgCode != null">,`org_code`</if>
         <if test="createTime != null">,`create_time`</if>
         <if test="updateTime != null">,`update_time`</if>
+        <if test="serialNumber != null">,`serial_number`</if>
         )
         values
         (
@@ -175,6 +181,7 @@
         <if test="orgCode != null">,#{orgCode}</if>
         <if test="createTime != null">,#{createTime}</if>
         <if test="updateTime != null">,#{update_time}</if>
+        <if test="serialNumber != null">,#{serialNumber}</if>
         )
     </insert>
 
@@ -199,7 +206,8 @@
         `insure_applicant_id`,
         `org_code`,
         `create_time`,
-        `update_time`
+        `update_time`,
+         `serial_number`
         )
         values
         <foreach collection="list" item="item" index="index" separator=",">
@@ -220,7 +228,8 @@
             #{item.insureApplicantId},
             #{item.orgCode},
             #{item.createTime},
-            #{item.updateTime}
+            #{item.updateTime}，
+            #{item.serialNumber}
             )
         </foreach>
     </insert>
@@ -247,7 +256,9 @@
         ip.update_time AS updateTime,
         ip.`status` as `status`,
         ip.org_code as orgCode,
-        ip.pay_id   as payId
+        ip.pay_id   as payId,
+        ip.serial_number   as serialNumber,
+               ip.policy_file as policyFile
         FROM
         insure_policy ip
         LEFT JOIN insure_user iu ON iu.policy_id = ip.id

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

@@ -22,7 +22,7 @@
                ipp.create_time as createTime
         from insure_product_plan ipp
                  LEFT JOIN insure_product ip on ip.id = ipp.product_id
-        WHERE ip.id = #{productId}
+        WHERE ip.id = #{productId} and delete_flag=0
     </select>
 
 </mapper>