|
|
@@ -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) {
|