diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java
index b1b957a4..81b36c12 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java
@@ -187,8 +187,12 @@ public class ReturnCommissionController {
if (shop == null) {
return ResultUtil.error("鍟嗛摵涓嶅瓨鍦紒");
}
+ if (!isShopWalletWithdrawEnabled(shop)) {
+ return ResultUtil.error("璇ュ簵閾哄凡璁剧疆涓嶆樉绀洪挶鍖呬綑棰濅笖涓嶅彲鎻愮幇锛");
+ }
returnCommission.setRemark("鍟嗗" + shop.getShopName() + "鎻愮幇");
- if (shop.getBalance().compareTo(returnCommission.getCommission()) < 0) {
+ final BigDecimal shopBalance = shop.getBalance() == null ? BigDecimal.ZERO : shop.getBalance();
+ if (shopBalance.compareTo(returnCommission.getCommission()) < 0) {
// 濡傛灉鎻愮幇閲戦澶т簬浣欓锛屽垯涓嶅厑璁告彁鐜
return ResultUtil.error("鎻愮幇閲戦涓嶅彲澶т簬浣ｉ噾浣欓锛");
}
@@ -217,7 +221,7 @@ public class ReturnCommissionController {
//returnCommission.setShopAfterRebateAmount(shopAfterRebateAmount);
// 3. 鏇存柊搴楅摵杩斾剑閲戦
//shop.setRebateAmount(shopAfterRebateAmount);
- shop.setBalance(shop.getBalance().subtract(commission));
+ shop.setBalance(shopBalance.subtract(commission));
shopService.update(shop);
//澧炲姞浣欓鍙樺姩璁板綍
@@ -514,6 +518,10 @@ public class ReturnCommissionController {
return null;
}
+ private boolean isShopWalletWithdrawEnabled(Shop shop) {
+ return shop != null && !Integer.valueOf(0).equals(shop.getShowWalletWithdraw());
+ }
+
private boolean isValidAliAccount(String aliAccount) {
final String account = aliAccount == null ? "" : aliAccount.trim();
return PHONE_PATTERN.matcher(account).matches() || EMAIL_PATTERN.matcher(account).matches();
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java
index 64da2430..a38b2916 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java
@@ -151,6 +151,9 @@ public class ShopController {
if (shop.getStoreConsumeOnly() == null) {
shop.setStoreConsumeOnly(0);
}
+ if (shop.getShowWalletWithdraw() == null) {
+ shop.setShowWalletWithdraw(1);
+ }
shopService.save(shop);
@@ -205,6 +208,9 @@ public class ShopController {
if (shop.getStoreConsumeOnly() != null) {
oldShop.setStoreConsumeOnly(shop.getStoreConsumeOnly());
}
+ if (shop.getShowWalletWithdraw() == null && oldShop.getShowWalletWithdraw() == null) {
+ oldShop.setShowWalletWithdraw(1);
+ }
UpdateUtils.copyNonNullProperties(shop, oldShop);
// 4. 鏇存柊鏁版嵁搴擄紙姝ゆ椂鏇存柊鐨勬槸甯︽湁瀹屾暣鏁版嵁鐨 oldShop锛屼笉浼氳娓呯┖鍏朵粬瀛楁锛
shopService.update(oldShop);
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java
index dbd5f6a8..6c236b0a 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java
@@ -776,10 +776,21 @@ public class WorkerController {
User user = userService.findById(userId);
Worker worker = workerService.findByUserId(userId);
List
shops = shopService.getShopByUserid(userId);
+ if (shops != null) {
+ for (Shop shop : shops) {
+ if (!isShopWalletWithdrawEnabled(shop)) {
+ shop.setBalance(BigDecimal.ZERO);
+ }
+ }
+ }
AdminUserVo vo = new AdminUserVo();
vo.setWorker(worker);
vo.setShop(shops);
vo.setUser(user);
return new ResultUtil().setData(vo);
}
+
+ private boolean isShopWalletWithdrawEnabled(Shop shop) {
+ return shop != null && !Integer.valueOf(0).equals(shop.getShowWalletWithdraw());
+ }
}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Shop.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Shop.java
index d448c656..abbd8fdb 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Shop.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Shop.java
@@ -139,6 +139,9 @@ public class Shop extends HiverBaseEntity {
@ApiModelProperty(value = "璐︽埛浣欓")
private BigDecimal balance;
+ @ApiModelProperty(value = "鏄惁鏄剧ず閽卞寘浣欓骞跺彲鎻愮幇 0鍚 1鏄")
+ private Integer showWalletWithdraw = 1;
+
@ApiModelProperty(value = "搴楅摵瑙勬牸搴撳垎绫籭d")
private String attrId;
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java
index 11cba5e5..10791275 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java
@@ -89,6 +89,7 @@ public class MallOrderServiceImpl extends ServiceImpl
+
@@ -66,7 +67,7 @@
id, create_by, create_time, del_flag, update_by, update_time, shop_name, shop_owner_id, shop_manger_id, region,
region_id, shop_area, shop_area_title, shop_type, shop_type_title, shop_address, year_fee, charge_time, start_time,
end_time, status, remark, business_district_level, contact_phone, shop_icon, defaulted, ali_account, ali_name,
-balance, attr_id, printing_method, printer_brand, printer_sn, printer_name, shop_images,shop_lename,shop_lecard,
+balance, show_wallet_withdraw, attr_id, printing_method, printer_brand, printer_sn, printer_name, shop_images,shop_lename,shop_lecard,
shop_score,isbrandflag,subtitle,shoprank,sale_count,is_student,client_id,merchant_type,
support_shop_delivery,order_bkge,shop_delivery_location,shop_delivery_duration,worker_id,worker_name,worker_phone,
support_transfer_delivery,transfer_delivery_duration,transfer_address_id,transfer_address_name
@@ -90,14 +91,14 @@ balance, attr_id, printing_method, printer_brand, printer_sn, printer_name, shop
insert into t_shop (id, create_by, create_time, del_flag, update_by, update_time, shop_name, shop_owner_id, shop_manger_id, region,
region_id, shop_area, shop_area_title, shop_type, shop_type_title, shop_address, year_fee, charge_time, start_time,
end_time, status, remark, business_district_level, contact_phone, shop_icon, defaulted, ali_account, ali_name,
- balance, attr_id, printing_method, printer_brand, printer_sn, printer_name, shop_images, shop_lename, shop_lecard, shop_score,
+ balance, show_wallet_withdraw, attr_id, printing_method, printer_brand, printer_sn, printer_name, shop_images, shop_lename, shop_lecard, shop_score,
isbrandflag, subtitle,shoprank, sale_count,is_student,client_id,merchant_type,
support_shop_delivery, order_bkge, shop_delivery_location, shop_delivery_duration, worker_id, worker_name, worker_phone,
support_transfer_delivery, transfer_delivery_duration, transfer_address_id, transfer_address_name)
values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shopName,jdbcType=VARCHAR}, #{shopOwnerId,jdbcType=VARCHAR}, #{shopMangerId,jdbcType=VARCHAR}, #{region,jdbcType=VARCHAR},
#{regionId,jdbcType=VARCHAR}, #{shopArea,jdbcType=VARCHAR}, #{shopAreaTitle,jdbcType=VARCHAR}, #{shopType,jdbcType=VARCHAR}, #{shopTypeTitle,jdbcType=VARCHAR}, #{shopAddress,jdbcType=VARCHAR}, #{yearFee,jdbcType=VARCHAR}, #{chargeTime,jdbcType=VARCHAR}, #{startTime,jdbcType=VARCHAR},
#{endTime,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{remark,jdbcType=LONGVARCHAR}, #{businessDistrictLevel,jdbcType=VARCHAR}, #{contactPhone,jdbcType=VARCHAR}, #{shopIcon,jdbcType=VARCHAR}, #{defaulted,jdbcType=INTEGER}, #{aliAccount,jdbcType=VARCHAR}, #{aliName,jdbcType=VARCHAR},
- #{balance,jdbcType=VARCHAR}, #{attrId,jdbcType=VARCHAR}, #{printingMethod,jdbcType=VARCHAR}, #{printerBrand,jdbcType=VARCHAR}, #{printerSn,jdbcType=VARCHAR}, #{printerName,jdbcType=VARCHAR}, #{shopImages,jdbcType=VARCHAR}, #{shopLename,jdbcType=VARCHAR}, #{shopLecard,jdbcType=VARCHAR}, #{shopScore,jdbcType=DECIMAL}, #{isbrandflag,jdbcType=INTEGER}, #{subtitle,jdbcType=VARCHAR}, #{shoprank,jdbcType=INTEGER}, #{saleCount,jdbcType=INTEGER}, #{isStudent,jdbcType=INTEGER},#{clientId,jdbcType=VARCHAR}, #{merchantType,jdbcType=INTEGER},
+ #{balance,jdbcType=VARCHAR}, #{showWalletWithdraw,jdbcType=INTEGER}, #{attrId,jdbcType=VARCHAR}, #{printingMethod,jdbcType=VARCHAR}, #{printerBrand,jdbcType=VARCHAR}, #{printerSn,jdbcType=VARCHAR}, #{printerName,jdbcType=VARCHAR}, #{shopImages,jdbcType=VARCHAR}, #{shopLename,jdbcType=VARCHAR}, #{shopLecard,jdbcType=VARCHAR}, #{shopScore,jdbcType=DECIMAL}, #{isbrandflag,jdbcType=INTEGER}, #{subtitle,jdbcType=VARCHAR}, #{shoprank,jdbcType=INTEGER}, #{saleCount,jdbcType=INTEGER}, #{isStudent,jdbcType=INTEGER},#{clientId,jdbcType=VARCHAR}, #{merchantType,jdbcType=INTEGER},
#{supportShopDelivery,jdbcType=INTEGER}, #{orderBkge,jdbcType=DECIMAL}, #{shopDeliveryLocation,jdbcType=INTEGER}, #{shopDeliveryDuration,jdbcType=INTEGER}, #{workerId,jdbcType=VARCHAR}, #{workerName,jdbcType=VARCHAR}, #{workerPhone,jdbcType=VARCHAR},
#{supportTransferDelivery,jdbcType=INTEGER}, #{transferDeliveryDuration,jdbcType=INTEGER}, #{transferAddressId,jdbcType=VARCHAR}, #{transferAddressName,jdbcType=VARCHAR})
@@ -179,6 +180,9 @@ balance, attr_id, printing_method, printer_brand, printer_sn, printer_name, shop
printer_brand,
+
+ show_wallet_withdraw,
+
printer_sn,
@@ -328,6 +332,9 @@ balance, attr_id, printing_method, printer_brand, printer_sn, printer_name, shop
#{printerBrand,jdbcType=VARCHAR},
+
+ #{showWalletWithdraw,jdbcType=INTEGER},
+
#{printerSn,jdbcType=VARCHAR},
@@ -477,6 +484,9 @@ balance, attr_id, printing_method, printer_brand, printer_sn, printer_name, shop
printer_brand = #{printerBrand,jdbcType=VARCHAR},
+
+ show_wallet_withdraw = #{showWalletWithdraw,jdbcType=INTEGER},
+
printer_sn = #{printerSn,jdbcType=VARCHAR},
@@ -578,6 +588,7 @@ balance, attr_id, printing_method, printer_brand, printer_sn, printer_name, shop
remark = #{remark,jdbcType=LONGVARCHAR},
printing_method = #{printingMethod,jdbcType=VARCHAR},
printer_brand = #{printerBrand,jdbcType=VARCHAR},
+ show_wallet_withdraw = #{showWalletWithdraw,jdbcType=INTEGER},
printer_sn = #{printerSn,jdbcType=VARCHAR},
printer_name = #{printerName,jdbcType=VARCHAR},
shop_images = #{shopImages,jdbcType=VARCHAR},
@@ -637,6 +648,7 @@ balance, attr_id, printing_method, printer_brand, printer_sn, printer_name, shop
attr_id = #{attrId,jdbcType=VARCHAR},
printing_method = #{printingMethod,jdbcType=VARCHAR},
printer_brand = #{printerBrand,jdbcType=VARCHAR},
+ show_wallet_withdraw = #{showWalletWithdraw,jdbcType=INTEGER},
printer_sn = #{printerSn,jdbcType=VARCHAR},
printer_name = #{printerName,jdbcType=VARCHAR},
shop_images = #{shopImages,jdbcType=VARCHAR},