Browse Source

no message

FengChaoYu 9 months ago
parent
commit
7f638a24a5

+ 2 - 1
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/WebsitSalesLogic.java

@@ -17,6 +17,7 @@ import com.gree.mall.miniapp.enums.PayOrderTypeEnum;
 import com.gree.mall.miniapp.enums.PayTypeEnum;
 import com.gree.mall.miniapp.enums.material.WebsitGoodsTypeEnum;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
+import com.gree.mall.miniapp.helper.ResponseHelper;
 import com.gree.mall.miniapp.logic.common.AllInPayLogic;
 import com.gree.mall.miniapp.logic.common.CommonLogic;
 import com.gree.mall.miniapp.logic.common.outside.WechatLogic;
@@ -320,7 +321,7 @@ public class WebsitSalesLogic {
         CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat(request);
 
         if (StringUtils.isBlank(wechat.getUser().getMobile())) {
-            throw new RemoteServiceException("未发现手机号, 不能提交订单");
+            throw new RemoteServiceException(ResponseHelper.ResponseCode_NOT_PHONE, "未发现手机号, 不能提交订单");
         }
 
         List<WebsitShoppingCartList> shoppingCartLists = this.queryShoppingCart(wechat.getUserId(), websitId, goodsType);

+ 5 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/repair/DailyWithholdLogic.java

@@ -68,8 +68,12 @@ public class DailyWithholdLogic {
     public SysDictCompany getConfig() {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
+        if (Objects.isNull(adminUser.getAdminCompanyWechat())) {
+            throw new RemoteServiceException("平台账号获取不到对应商户”结算汇总暂扣款比例“配置");
+        }
+
         SysDictCompany dict = sysDictCompanyService.lambdaQuery()
-                .eq(Objects.nonNull(adminUser.getAdminCompanyWechat()), SysDictCompany::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId())
+                .eq(SysDictCompany::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId())
                 .eq(SysDictCompany::getDictCode, SysDictConstant.REPAIR_DAILY)
                 .last("limit 1")
                 .one();