bug

513671e0 · zhiwj · 921b8b3b · 513671e0 · 513671e0 · 513671e0
Commit 513671e0 authored Jun 22, 2020 by zhiwj
6 changed files
--- a/gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/MemberTagItemImportMapper.java
+++ b/gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/MemberTagItemImportMapper.java
+package com.gic.enterprise.dao.mapper;
+
+import com.gic.enterprise.entity.TabGicMemberTagItemImport;
+
+public interface MemberTagItemImportMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param tagItemImportId 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(String tagItemImportId);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabGicMemberTagItemImport record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabGicMemberTagItemImport record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param tagItemImportId 主键
+     * @return 实体对象
+     */
+    TabGicMemberTagItemImport selectByPrimaryKey(String tagItemImportId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabGicMemberTagItemImport record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabGicMemberTagItemImport record);
+}
\ No newline at end of file
--- a/gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingOrder.java
+++ b/gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabBillingOrder.java
@@ -22,7 +22,7 @@ public class TabBillingOrder {
    private String serialNumber;

    /**
-     * 订单状态
+     * 订单状态 1：审核中  2:已取消   3：审核失败  4：审核通过（已完成）  0:待支付
     */
    private Integer orderStatus;

@@ -34,7 +34,7 @@ public class TabBillingOrder {
    /**
     * 支付方式 1微信 2支付宝 3.线下支付  4余额支付
     */
-    private Integer payType=0;
+    private Integer payType;

    /**
     * 应付金额
@@ -56,7 +56,6 @@ public class TabBillingOrder {
     */
    private Integer couponCardId;

-
    /**
     * 审批结果id
     */
@@ -82,6 +81,16 @@ public class TabBillingOrder {
     */
    private String itemJson;

+    /**
+     * 1:短信套餐包    
+     */
+    private Integer orderType;
+
+    /**
+     * 发起人
+     */
+    private Integer initiatorUser;
+
    public Integer getOrderId() {
        return orderId;
    }
@@ -201,4 +210,20 @@ public class TabBillingOrder {
    public void setItemJson(String itemJson) {
        this.itemJson = itemJson;
    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    public Integer getInitiatorUser() {
+        return initiatorUser;
+    }
+
+    public void setInitiatorUser(Integer initiatorUser) {
+        this.initiatorUser = initiatorUser;
+    }
 }
\ No newline at end of file
--- a/gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabGicMemberTagItemImport.java
+++ b/gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabGicMemberTagItemImport.java
+package com.gic.enterprise.entity;
+
+import java.util.Date;
+
+/**
+ * tab_gic_member_tag_item_import
+ */
+public class TabGicMemberTagItemImport {
+    /**
+     * 导入标签项与会员标签
+     */
+    private String tagItemImportId;
+
+    /**
+     * 
+     */
+    private String enterpriseId;
+
+    /**
+     * 标签项id
+     */
+    private String tagItemId;
+
+    /**
+     * 标签id
+     */
+    private String tagId;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 状态 0 删除 1需要处理 2异常 
+     */
+    private Integer status;
+
+    /**
+     * 异常原因
+     */
+    private String reason;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    /**
+     * 
+     */
+    private String createUser;
+
+    public String getTagItemImportId() {
+        return tagItemImportId;
+    }
+
+    public void setTagItemImportId(String tagItemImportId) {
+        this.tagItemImportId = tagItemImportId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getTagItemId() {
+        return tagItemId;
+    }
+
+    public void setTagItemId(String tagItemId) {
+        this.tagItemId = tagItemId;
+    }
+
+    public String getTagId() {
+        return tagId;
+    }
+
+    public void setTagId(String tagId) {
+        this.tagId = tagId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+}
\ No newline at end of file
--- a/gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingOrderServiceImpl.java
+++ b/gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingOrderServiceImpl.java
@@ -46,6 +46,7 @@ public class BillingOrderServiceImpl implements BillingOrderService {
        billingOrder.setItemJson(billingOrderDTO.getItemJson());
        billingOrder.setPayType(billingOrderDTO.getPayType());
        billingOrder.setOrderContent(billingOrderDTO.getOrderContent());
+        billingOrder.setInitiatorUser(billingOrderDTO.getInitiatorUser());
        tabBillingOrderMapper.insertSelective(billingOrder);
        return billingOrder.getOrderId();
    }

--- a/gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/OfflineStrategy.java
+++ b/gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/OfflineStrategy.java
@@ -12,6 +12,7 @@ import com.gic.enterprise.dto.ApprovalCallBackDTO;
 import com.gic.enterprise.dto.BillingPayInfoDTO;
 import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.dto.OutPayDTO;
+import com.gic.enterprise.entity.TabBillingOrder;
 import com.gic.enterprise.entity.TabBillingPayInfo;
 import com.gic.enterprise.entity.TabBillingRechargeRecord;
 import com.gic.enterprise.entity.TabEnterprise;
@@ -161,7 +162,7 @@ public class OfflineStrategy implements PayStrategy {
                case 2:
                    // 短信套餐包购买
                    this.billingOrderService.updateBySerialNumber(resData.getOrderSerialNumber(), resData.getTotalFeePaid(), resData.getAuditStatus(), resData.getTimeEnd());
-                    sendApprovalSms(resData, "GICJFZX008");
+                    sendOrderApprovalSms(resData, "GICJFZX008");
                    break;
                default:
                    break;
@@ -184,6 +185,16 @@ public class OfflineStrategy implements PayStrategy {
        sendSms(resData, userDTO, code);
    }

+    private void sendOrderApprovalSms(ApprovalCallBackDTO resData, String code) {
+//        TabBillingRechargeRecord rechargeRecord = billingRechargeRecordService.getRechargeRecordBySerialNumber(resData.getOrderSerialNumber());
+        TabBillingOrder order = billingOrderService.getOrderBySerialNumber(resData.getOrderSerialNumber());
+        Integer initiator = order.getInitiatorUser();
+        if (initiator != null) {
+            UserDTO userDTO = userApiService.getUserById(initiator).getResult();
+            sendSms(resData, userDTO, code);
+        }
+    }
+
    private void sendSms(ApprovalCallBackDTO resData, UserDTO userDTO, String code) {
        try {
            if (StringUtils.isBlank(userDTO.getPhoneAreaCode())) {

--- a/gic-platform-enterprise-service/src/main/resources/mapper/TabBillingOrderMapper.xml
+++ b/gic-platform-enterprise-service/src/main/resources/mapper/TabBillingOrderMapper.xml
@@ -17,11 +17,13 @@
    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
    <result column="item_json" jdbcType="VARCHAR" property="itemJson" />
+    <result column="order_type" jdbcType="INTEGER" property="orderType" />
+    <result column="initiator_user" jdbcType="INTEGER" property="initiatorUser" />
  </resultMap>
  <sql id="Base_Column_List">
    order_id, enterprise_id, serial_number, order_status, order_content, pay_type, total_fee, 
-    total_fee_paid, pay_info_id, coupon_card_id, audit_result_id, status,
-    create_time, update_time, item_json
+    total_fee_paid, pay_info_id, coupon_card_id, audit_result_id, status, create_time, 
+    update_time, item_json, order_type, initiator_user
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
    select 
@@ -37,15 +39,15 @@
    insert into tab_billing_order (order_id, enterprise_id, serial_number, 
      order_status, order_content, pay_type, 
      total_fee, total_fee_paid, pay_info_id, 
-      coupon_card_id, audit_result_id,
-      status, create_time, update_time, 
-      item_json)
+      coupon_card_id, audit_result_id, status, 
+      create_time, update_time, item_json, 
+      order_type, initiator_user)
    values (#{orderId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR}, 
      #{orderStatus,jdbcType=INTEGER}, #{orderContent,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, 
      #{totalFee,jdbcType=DOUBLE}, #{totalFeePaid,jdbcType=DOUBLE}, #{payInfoId,jdbcType=INTEGER}, 
-      #{couponCardId,jdbcType=INTEGER}, #{auditResultId,jdbcType=INTEGER},
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{itemJson,jdbcType=VARCHAR})
+      #{couponCardId,jdbcType=INTEGER}, #{auditResultId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{itemJson,jdbcType=VARCHAR}, 
+      #{orderType,jdbcType=INTEGER}, #{initiatorUser,jdbcType=INTEGER})
  </insert>
  <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabBillingOrder">
    <selectKey keyProperty="orderId" order="AFTER" resultType="java.lang.Integer">
@@ -98,6 +100,12 @@
      <if test="itemJson != null">
        item_json,
      </if>
+      <if test="orderType != null">
+        order_type,
+      </if>
+      <if test="initiatorUser != null">
+        initiator_user,
+      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="orderId != null">
@@ -145,6 +153,12 @@
      <if test="itemJson != null">
        #{itemJson,jdbcType=VARCHAR},
      </if>
+      <if test="orderType != null">
+        #{orderType,jdbcType=INTEGER},
+      </if>
+      <if test="initiatorUser != null">
+        #{initiatorUser,jdbcType=INTEGER},
+      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabBillingOrder">
@@ -192,6 +206,12 @@
      <if test="itemJson != null">
        item_json = #{itemJson,jdbcType=VARCHAR},
      </if>
+      <if test="orderType != null">
+        order_type = #{orderType,jdbcType=INTEGER},
+      </if>
+      <if test="initiatorUser != null">
+        initiator_user = #{initiatorUser,jdbcType=INTEGER},
+      </if>
    </set>
    where order_id = #{orderId,jdbcType=INTEGER}
  </update>
@@ -210,7 +230,9 @@
      status = #{status,jdbcType=INTEGER},
      create_time = #{createTime,jdbcType=TIMESTAMP},
      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      item_json = #{itemJson,jdbcType=VARCHAR}
+      item_json = #{itemJson,jdbcType=VARCHAR},
+      order_type = #{orderType,jdbcType=INTEGER},
+      initiator_user = #{initiatorUser,jdbcType=INTEGER}
    where order_id = #{orderId,jdbcType=INTEGER}
  </update>
  <select id="getOrderByPayInfoId" resultMap="BaseResultMap">