diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue
index efc1ff946..0d83b2674 100644
--- a/fuintAdmin/src/views/staffCommission/staffCommission.vue
+++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue
@@ -25,9 +25,9 @@
clearable
placeholder="全部"
>
-
-
-
+
+
+
@@ -77,9 +77,9 @@
- 油品订单出售
- 商品订单出售
- 储值卡充值
+ 油品订单提成
+ 商品订单提成
+ 储值卡充值提成
油品退款
商品退款
@@ -205,7 +205,9 @@
- {{ dict.label }}
+
+
+
@@ -357,7 +359,7 @@ export default {
// 表单校验
rules: {
name: [
- { required: true, message: "供应商名称不能为空", trigger: "blur" },
+ { required: true, message: "提成方案名称不能为空", trigger: "blur" },
],
commissionSource: [
{ required: true, message: "请选择提成来源", trigger: "blur" },
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
index 242e6641b..bd88c2538 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
@@ -206,6 +206,10 @@ public class FyPayServiceImpl implements FyPayService {
// 商品订单
goodsOrder.setStatus("paid");
goodsOrder.setPayTime(date);
+ Boolean isMember = false;
+ if (goodsOrder.getUserId()!=null){
+ isMember = true;
+ }
staffCommissionService.countStaffCommission(goodsOrder.getStaffId(),goodsOrder.getStoreId(),goodsOrder.getAmount(),goodsOrder.getPayAmount(),0.0,"2",orderNo);
if (!map1.get("goodsOrder").equals("[]")){
List goods = JSONArray.parseArray(map1.get("goodsOrder"), JSONObject.class);
@@ -214,7 +218,7 @@ public class FyPayServiceImpl implements FyPayService {
orderGoods.setOrderId(goodsOrder.getId());
orderGoods.setGoodsId(Integer.valueOf(good.get("id").toString()));
orderGoods.setNum(Integer.valueOf(good.get("num").toString()));
- orderGoodsService.insertOrderGoods(orderGoods,storeId1);
+ orderGoodsService.insertOrderGoods(orderGoods,storeId1,isMember);
}
}
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/StaffCommissionServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/StaffCommissionServiceImpl.java
index e7a79a6ae..99ee67800 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/StaffCommissionServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/StaffCommissionServiceImpl.java
@@ -181,7 +181,7 @@ public class StaffCommissionServiceImpl extends ServiceImpl
select sa.*,mg.name,mg.goods_no,mg.pinyin_code,mg.unit from sale_statistic sa
- inner join mt_goods mg on sa.goods_id = mg.id
+ left join mt_goods mg on sa.goods_id = mg.id