Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreCartScrmMapper.java

@@ -99,7 +99,6 @@ public interface FsStoreCartScrmMapper
     void updateIsPay(String cartIds);
 
 
-    @Select("select ifnull(sum(c.cart_num),0) from fs_store_cart_scrm c inner join fs_store_product_scrm p on p.product_id=c.product_id inner join fs_store_product_attr_value_scrm v on v.id=c.product_attr_value_id where c.is_pay=0 and c.is_del=0 and c.is_buy=0 and p.is_show=1 and p.is_del=0 and c.user_id= #{userId}")
     Integer selectFsStoreCartCountByUserId(long userId);
     @Select({"<script> " +
             "select ifnull(sum(c.cart_num),0) from fs_store_cart_scrm c  " +

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -73,6 +73,7 @@ import com.fs.his.service.IFsStorePaymentService;
 import com.fs.his.service.IFsUserIntegralLogsService;
 import com.fs.his.service.IFsUserWatchService;
 import com.fs.his.utils.ConfigUtil;
+import com.fs.his.utils.PhoneUtil;
 import com.fs.his.vo.FsInquiryOrderVO;
 import com.fs.his.vo.FsStoreOrderAmountScrmStatsVo;
 import com.fs.his.vo.FsStoreOrderExcelVO;
@@ -737,6 +738,10 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
     public R confirmOrder(long uid, FsStoreConfirmOrderParam cartParam) {
         //获取地址信息和购物车信息
         FsUserAddressScrm address = userAddressMapper.selectFsUserAddressByDefaultAddress(uid);
+        if(address != null && address.getPhone().length()>11 && StringUtils.endsWith(address.getPhone(),"==")){
+            // 解密手机号
+            address.setPhone(PhoneUtil.decryptPhone(address.getPhone()));
+        }
         List<FsStoreCartQueryVO> carts = cartMapper.selectFsStoreCartListByIds(cartParam.getCartIds());
         for (FsStoreCartQueryVO cart : carts) {
             if (cart.getChangePrice() != null && BigDecimal.ZERO.compareTo(cart.getChangePrice()) < 0) {

fs-service/src/main/resources/mapper/hisStore/FsStoreCartScrmMapper.xml

@@ -43,6 +43,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFsStoreCartVo"/>
         where id = #{id}
     </select>
+    <select id="selectFsStoreCartCountByUserId" resultType="java.lang.Integer">
+        select ifnull(sum(c.cart_num),0) from fs_store_cart_scrm c
+            inner join fs_store_product_scrm p on p.product_id=c.product_id
+            inner join fs_store_product_attr_value_scrm v on v.id=c.product_attr_value_id
+            where c.is_pay=0 and c.is_del=0 and c.is_buy=0 and p.is_show=1 and p.is_del=0 and c.user_id= #{userId}
+    </select>
 
     <insert id="insertFsStoreCart" parameterType="FsStoreCartScrm" useGeneratedKeys="true" keyProperty="id">
         insert into fs_store_cart_scrm