协销购物车结算

src/main/java/com/caimei365/order/mapper/BaseMapper.java

@@ -164,4 +164,8 @@ public interface BaseMapper {
      * 保存余额到余额收支记录
      */
     void insertBalanceRecord(BalanceRecordPo balanceRecord);
+    /**
+     * 获取条款列表
+     */
+    List<ClauseVo> getClauseList();
 }

src/main/java/com/caimei365/order/service/impl/CartSellerServiceImpl.java

@@ -625,6 +625,8 @@ public class CartSellerServiceImpl implements CartSellerService {
             }
         }
         couponList.sort((o1, o2) -> o2.getCouponAmount().compareTo(o1.getCouponAmount()));
+        // 获取条款列表
+        List<ClauseVo> clauseList = baseMapper.getClauseList();
 
         // 包装返回数据
         Map<String, Object> resultData = new HashMap<>();
@@ -639,6 +641,8 @@ public class CartSellerServiceImpl implements CartSellerService {
         resultData.put("userMoney", availableMoney);
         resultData.put("userBeans", userBeans);
         resultData.put("includeRecharge", includeRecharge);
+        resultData.put("couponList", couponList);
+        resultData.put("clauseList", clauseList);
         return ResponseJson.success(resultData);
     }
 

src/main/java/com/caimei365/order/service/impl/RemoteCallServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
 import javax.annotation.Resource;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -93,7 +94,9 @@ public class RemoteCallServiceImpl implements RemoteCallService {
                                 .contentType(MediaType.APPLICATION_FORM_URLENCODED)
                                 .body(BodyInserters.fromFormData(map))
                                 .retrieve()
-                                .bodyToMono(String.class);
+                                .bodyToMono(String.class)
+                                // 10秒超时
+                                .timeout(Duration.ofSeconds(10));
                         result.subscribe(log::info);
                         result.subscribe(jsonStr -> {
                             JSONObject parseObject = JSONObject.parseObject(jsonStr);
@@ -136,7 +139,9 @@ public class RemoteCallServiceImpl implements RemoteCallService {
                 .contentType(MediaType.APPLICATION_FORM_URLENCODED)
                 .body(BodyInserters.fromFormData(map))
                 .retrieve()
-                .bodyToMono(String.class);
+                .bodyToMono(String.class)
+                // 10秒超时
+                .timeout(Duration.ofSeconds(10));
         result.subscribe(log::info);
         result.subscribe(jsonStr -> {
             JSONObject parseObject = JSONObject.parseObject(jsonStr);
@@ -172,7 +177,9 @@ public class RemoteCallServiceImpl implements RemoteCallService {
                 .get()
                 .uri("http://CAIMEI365-CLOUD-TOOLS/tools/query/logistics" + params)
                 .retrieve()
-                .bodyToMono(String.class);
+                .bodyToMono(String.class)
+                // 10秒超时
+                .timeout(Duration.ofSeconds(10));
         result.subscribe(log::info);
         result.subscribe(jsonStr -> {
             JSONObject parseObject = JSONObject.parseObject(jsonStr);

src/main/resources/mapper/BaseMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei365.order.mapper.BaseMapper">
     <select id="getShopNameById" resultType="java.lang.String">
-        SELECT `name` FROM shop WHERE shopID = #{shopId}
+        SELECT `name` FROM shop WHERE shopID = #{shopId} LIMIT 1
     </select>
     <select id="getClubNameById" resultType="java.lang.String">
-        SELECT `name` FROM club WHERE clubID = #{clubId}
+        SELECT `name` FROM club WHERE clubID = #{clubId} LIMIT 1
     </select>
     <insert id="insertUserInvoiceByUserId" parameterType="com.caimei365.order.model.vo.InvoiceVo">
         INSERT INTO cm_user_invoiceinfo (userId, invoiceTitle, corporationTaxNum, registeredAddress, registeredPhone, bankAccountNo, openBank)
@@ -38,13 +38,13 @@
         WHERE id = #{id}
     </update>
     <select id="getUserIdByClubId" resultType="java.lang.Integer">
-        select userID from user where clubID = #{clubId}
+        select userID from user where clubID = #{clubId} LIMIT 1
     </select>
     <select id="getIdentityByUserId" resultType="java.lang.Integer">
-        select userIdentity from user where userID = #{userId}
+        select userIdentity from user where userID = #{userId} LIMIT 1
     </select>
     <select id="getUserNameByUserId" resultType="java.lang.String">
-        select userName from user where userID = #{userId}
+        select userName from user where userID = #{userId} LIMIT 1
     </select>
     <select id="getLadderPriceList" resultType="com.caimei365.order.model.vo.LadderPriceVo">
         select
@@ -196,6 +196,15 @@
     <select id="getShopIdByproductId" resultType="java.lang.Integer">
         SELECT shopID FROM product WHERE productID = #{productId}
     </select>
+    <select id="getClauseList" resultType="com.caimei365.order.model.vo.ClauseVo">
+        SELECT
+            id,
+            name,
+            content,
+            clauseType,
+            enabledStatus
+        FROM bp_clause
+    </select>
     <insert id="insertDiscernReceipt" keyColumn="id" keyProperty="id" parameterType="com.caimei365.order.model.po.DiscernReceiptPo" useGeneratedKeys="true">
         INSERT INTO cm_discern_receipt (payWay, payType, receiptType, receiptStatus, receiptAmount, confirmType,
         receiptDate, confirmDate, reviewDate, updateDate, delFlag, rePayFlag, formData)