修复优惠券

src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfOrderController.java

@@ -31,15 +31,16 @@ public class TbCfOrderController {
 
     @ApiOperation("用户结算，返回订单")
     @GetMapping("/settle")
-    public Result<TbCfOrderVo> settleAccount(@ApiParam("发放ID") @RequestParam(value = "iss_coupon_id", required = false) String iss_coupon_id) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException {
-        return tbCfOrderService.settleAccount(iss_coupon_id);
+    public Result<TbCfOrderVo> settleAccount(@ApiParam("发放ID") @RequestParam(value = "toitableId",required = false) String toitableId) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException {
+        return tbCfOrderService.settleAccount(toitableId);
     }
 
     @ApiOperation("用户确定下单")
     @PostMapping("/place")
-    public Result placeOrder(@ApiParam("订单详情") @RequestBody TbCfOrderVo tbCfOrderVo, @ApiParam("发放ID") @RequestParam(value = "iss_coupon_id", required = false) String iss_coupon_id) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException {
-        System.out.println("发放Id" + iss_coupon_id);
-        return tbCfOrderService.placeOrder(tbCfOrderVo, iss_coupon_id);
+ public Result placeOrder(@ApiParam("订单详情") @RequestBody TbCfOrderVo tbCfOrderVo,@ApiParam("发放ID") @RequestParam(value = "toitableId",required = false) String toitableId) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException {
+        System.out.println("发放Id"+toitableId);
+        return tbCfOrderService.placeOrder(tbCfOrderVo,toitableId);
+
     }
 
     /**

src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfCouponEntity.java

@@ -21,7 +21,7 @@ public class TbCfCouponEntity implements Serializable {
      *优惠券发放表id
      */
     @ApiModelProperty("优惠券发放表id")
-    private String issCouponId;
+    private String toitableId;
     /**
      * 优惠券id
      */
@@ -136,12 +136,12 @@ public class TbCfCouponEntity implements Serializable {
      * 设置：设置是否是注册就是的优惠券，(0)默认状态，（1）是用户注册就送这张优惠券
      */
 
-    public String getIssCouponId() {
-        return issCouponId;
+    public String getToitableId() {
+        return toitableId;
     }
 
-    public void setIssCouponId(String issCouponId) {
-        this.issCouponId = issCouponId;
+    public void setToitableId(String toitableId) {
+        this.toitableId = toitableId;
     }
 
     public String getCouponId() {

src/main/java/com/diaoyun/zion/chinafrica/service/TbCfOrderService.java

@@ -80,7 +80,7 @@ public interface TbCfOrderService {
      *
      * @return
      */
-    Result settleAccount(String iss_coupon_id) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException;
+    Result settleAccount(String toitableId) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException;
 
     /**
      * 用户下单
@@ -88,7 +88,7 @@ public interface TbCfOrderService {
      * @param tbCfOrderVo
      * @return
      */
-    Result placeOrder(TbCfOrderVo tbCfOrderVo,String iss_coupon_id) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException;
+    Result placeOrder(TbCfOrderVo tbCfOrderVo,String toitableId) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException;
 
     /**
      * 获取用户订单列表

src/main/resources/mapper/TbCfOrderDao.xml

@@ -137,7 +137,7 @@
         </if>
 	</select>
 	 <select id="queryCouponPrice" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
-		 select t2.* from tb_cf_issue_coupon t1 left join tb_cf_coupon t2 on t2.coupon_id=t1.coupon_id where t1.coupon_issuetable_id=#{iss_coupon_id}
+		 select t2.* from tb_cf_toicoupon t1 left join tb_cf_coupon t2 on t2.coupon_id=t1.coupon_id where t1.toitable_id=#{toitableId}
 	 </select>
 	<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
 		insert into tb_cf_order(