fix:下单流程bug

kmall-admin/src/main/java/com/kmall/admin/entity/haikong/HaiKongMemberScoreChangeRecordEntity.java

@@ -1,5 +1,7 @@
 package com.kmall.admin.entity.haikong;
 
+import com.kmall.admin.haikong.constant.HaiKongMemberScoreChangeEventEnum;
+
 import java.util.Date;
 
 /**
@@ -35,7 +37,7 @@ public class HaiKongMemberScoreChangeRecordEntity {
 
     /**
      * 变动事件，增 or 减
-     * {@link com.kmall.admin.haikong.constant.HaiKoneMemberScoreChangeEventEnum}
+     * {@link HaiKongMemberScoreChangeEventEnum}
      */
     private String changeEvent;
 

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -2322,7 +2322,7 @@ public class OrderServiceImpl implements OrderService {
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public synchronized Map offlineRetailSubmit(Map param, SysUserEntity user) {
         // 解析订单数据 List
         List<LinkedHashMap> goodsList = (List<LinkedHashMap>) param.get("goodsList");

kmall-admin/src/main/resources/mybatis/mapper/haikong/HaiKongMemberOrderSyncResendDao.xml

@@ -35,26 +35,30 @@
     </select>
 
     <insert id="save" parameterType="com.kmall.admin.entity.haikong.HaiKongMemberOrderSyncResendEntity" useGeneratedKeys="true" keyProperty="id">
-        insert into haikong_member_order_sync_resend(
-        `open_id`,
-        `phone`,
-        `consume_date`,
-        `order_amount`,
-        `order_no`,
-        `order_score`,
-        `resend_status`,
-        `last_resend_time`,
-        `create_time`)
-        values(
-        #{openId},
-        #{phone},
-        #{consumeDate},
-        #{orderAmount},
-        #{orderNo},
-        #{orderScore},
-        #{resendStatus},
-        #{lastResendTime},
-        #{createTime}
+        insert into haikong_member_order_sync_resend
+        (
+            `open_id`,
+            `phone`,
+            `consume_date`,
+            `order_amount`,
+            `order_no`,
+            `order_score`,
+            `resend_status`,
+            `last_resend_time`,
+            `create_time`
+        )
+        values
+        (
+            #{openId},
+            #{phone},
+            #{consumeDate},
+            #{orderAmount},
+            #{orderNo},
+            #{orderScore},
+            #{resendStatus},
+            #{lastResendTime},
+            #{createTime}
+        )
     </insert>
 
     <update id="update" parameterType="com.kmall.admin.entity.haikong.HaiKongMemberOrderSyncResendEntity">

kmall-admin/src/main/resources/mybatis/mapper/haikong/HaiKongMemberScoreChangeRecordDao.xml

@@ -10,6 +10,7 @@
         <result column="change_event" property="changeEvent" />
         <result column="change_id" property="changeId" />
         <result column="statement_id" property="statementId" />
+        <result column="resend_status" property="resendStatus" />
         <result column="modify_time" property="modifyTime" />
         <result column="create_time" property="createTime" />
     </resultMap>
@@ -37,26 +38,32 @@
     </select>
 
     <insert id="save" parameterType="com.kmall.admin.entity.haikong.HaiKongMemberScoreChangeRecordEntity" useGeneratedKeys="true" keyProperty="id">
-        insert into haikong_member_score_change_record(
-        `open_id`,
-        `score`,
-        `out_biz_no`,
-        `change_reason`,
-        `change_event`,
-        `change_id`,
-        `statement_id`,
-        `modify_time`,
-        `create_time`)
-        values(
-        #{openId},
-        #{score},
-        #{outBizNo},
-        #{changeReason},
-        #{changeId},
-        #{changeEvent},
-        #{statementId},
-        #{modifyTime},
-        #{createTime}
+        insert into haikong_member_score_change_record
+        (
+            `open_id`,
+            `score`,
+            `out_biz_no`,
+            `change_reason`,
+            `change_event`,
+            `change_id`,
+            `statement_id`,
+            `resend_status`,
+            `modify_time`,
+            `create_time`
+        )
+        values
+        (
+            #{openId},
+            #{score},
+            #{outBizNo},
+            #{changeReason},
+            #{changeEvent},
+            #{changeId},
+            #{statementId},
+            #{resendStatus},
+            #{modifyTime},
+            #{createTime}
+        )
     </insert>
 
     <update id="updateByOutBizNo" parameterType="com.kmall.admin.entity.haikong.HaiKongMemberScoreChangeRecordEntity">
@@ -69,6 +76,7 @@
             <if test="changeId != null">`change_id` = #{changeId}, </if>
             <if test="changeEvent != null">`change_event` = #{changeEvent}, </if>
             <if test="statementId != null">`statement_id` = #{statementId}, </if>
+            <if test="resendStatus != null">`resend_status` = #{resendStatus}, </if>
             <if test="modifyTime != null">`modify_time` = #{modifyTime}</if>
             <if test="createTime != null">`create_time` = #{createTime}</if>
         </set>