支付完成发送卡券

src/main/java/com/gogirl/application/market/coupon/ICouponsForConsumptionService.java

+package com.gogirl.application.market.coupon;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gogirl.domain.market.coupon.CouponsForConsumption;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-11-10
+ */
+public interface ICouponsForConsumptionService extends IService<CouponsForConsumption> {
+
+}

src/main/java/com/gogirl/application/market/coupon/impl/CouponsForConsumptionServiceImpl.java

+package com.gogirl.application.market.coupon.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gogirl.application.market.coupon.ICouponsForConsumptionService;
+import com.gogirl.domain.market.coupon.CouponsForConsumption;
+import com.gogirl.infrastructure.mapper.market.coupon.CouponsForConsumptionMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-11-10
+ */
+@Service
+public class CouponsForConsumptionServiceImpl extends ServiceImpl<CouponsForConsumptionMapper, CouponsForConsumption> implements ICouponsForConsumptionService {
+
+}

src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java

@@ -2,10 +2,7 @@ package com.gogirl.application.market.coupon.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gogirl.application.market.coupon.CouponCustomerRelevanceService;
-import com.gogirl.application.market.coupon.CouponOrderRelevanceService;
-import com.gogirl.application.market.coupon.CouponService;
-import com.gogirl.application.market.coupon.MarketService;
+import com.gogirl.application.market.coupon.*;
 import com.gogirl.application.market.timescard.TimesCardCustomerRelevanceService;
 import com.gogirl.application.market.timescard.TimesCardUsedRecordService;
 import com.gogirl.application.order.market.ICouponOrderService;
@@ -13,6 +10,7 @@ import com.gogirl.application.order.serve.OrderServeService;
 import com.gogirl.domain.market.coupon.Coupon;
 import com.gogirl.domain.market.coupon.CouponCustomerRelevance;
 import com.gogirl.domain.market.coupon.CouponOrderRelevance;
+import com.gogirl.domain.market.coupon.CouponsForConsumption;
 import com.gogirl.domain.market.discount.DiscountConfig;
 import com.gogirl.domain.market.timescard.TimesCardCustomerRelevance;
 import com.gogirl.domain.market.timescard.TimesCardOrderServeDetail;
@@ -349,8 +347,17 @@ public class MarketServiceImpl implements MarketService {
             timesCardCustomerRelevanceService.updateById(timesCardCustomerRelevance);
 
         });
+        //todo 发卡券 发短信
+        CouponsForConsumption couponsForConsumption = couponsForConsumptionService.list().stream().findAny().orElse(null);
+        if (couponsForConsumption != null) {
+            OrderManage orderManage = orderManageMapper.selectById(orderId);
+            //发卡券
+            couponService.sendCoupon(couponsForConsumption.getCouponId(), orderManage.getOrderUser());
+        }
     }
 
+    @Resource
+    ICouponsForConsumptionService couponsForConsumptionService;
 
     public void achievementReCalc(Integer orderId) {
 

src/main/java/com/gogirl/domain/market/coupon/CouponsForConsumption.java

+package com.gogirl.domain.market.coupon;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-11-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="CouponsForConsumption对象", description="")
+public class CouponsForConsumption implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "卡券配置id")
+    private Integer couponId;
+
+    @ApiModelProperty(value = "短信内容")
+    private String messageInfo;
+
+    private Integer createUserId;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime lastUpdateTime;
+
+
+}

src/main/java/com/gogirl/infrastructure/feign/AdminFeign.java

@@ -75,6 +75,11 @@ public interface AdminFeign {
             produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     AdminResult<List<Map<String, Object>>> revenueServiceListApi(@RequestBody RevenueServiceListApiRequest request);
 
+    @PostMapping(value = "/api/Report/RevenueServiceListApi",
+            consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,
+            produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    AdminResult<List<Map<String, Object>>> sendMessage(@RequestBody SendMessageRequest request);
+
     @Component
     class AdminFeignFallback implements AdminFeign {
 
@@ -123,5 +128,10 @@ public interface AdminFeign {
         public AdminResult<List<Map<String, Object>>> revenueServiceListApi(RevenueServiceListApiRequest request) {
             return new AdminResult<>();
         }
+
+        @Override
+        public AdminResult<List<Map<String, Object>>> sendMessage(SendMessageRequest request) {
+            return null;
+        }
     }
 }

src/main/java/com/gogirl/infrastructure/mapper/market/coupon/CouponsForConsumptionMapper.java

+package com.gogirl.infrastructure.mapper.market.coupon;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gogirl.domain.market.coupon.CouponsForConsumption;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-11-10
+ */
+public interface CouponsForConsumptionMapper extends BaseMapper<CouponsForConsumption> {
+
+}

src/main/java/com/gogirl/interfaces/market/coupon/CouponsForConsumptionController.java

+package com.gogirl.interfaces.market.coupon;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-11-10
+ */
+@RestController
+@RequestMapping("/coupons-for-consumption")
+public class CouponsForConsumptionController {
+
+}

src/main/java/com/gogirl/shared/admin/dashboard/req/SendMessageRequest.java

+package com.gogirl.shared.admin.dashboard.req;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/8/20 1:20 下午
+ */
+@Data
+public class SendMessageRequest {
+
+    @JsonProperty("message")
+    private String message;
+
+    @JsonProperty("phone")
+    private String phone;
+
+    @JsonProperty("api_brand_id")
+    private Integer apiBrandId = 1;
+
+}

src/main/resources/mapper/market/coupon/CouponsForConsumptionMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gogirl.infrastructure.mapper.market.coupon.CouponsForConsumptionMapper">
+
+</mapper>

src/test/java/com/gogirl/CodeGenerator.java

@@ -53,7 +53,7 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/gogirl_pre?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull");
+        dsc.setUrl("jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull");
         // dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("root");