经营状况的付款

package-basic-data/pages/func-buy/add-confirm/add-confirm.wxml

@@ -22,13 +22,14 @@
 	<view class="view-margin">
 		<view style="display: flex;justify-content: space-between;align-items: center;">
 			<view>订单详情
-				<dk-tip slot="label-icon" style="display: inline-block;" id="tipOrd" Up="{{true}}" Right="{{true}}" tipContent='账户有效期标准化至统一到期日' bind:clickTip="closeAllTips"/>
+				<dk-tip slot="label-icon" style="display: inline-block;" id="tipOrd" Up="{{true}}" Right="{{true}}" tipContent='账户有效期标准化至统一到期日' bind:clickTip="closeAllTips" />
 			</view>
 			<view>{{userEndDateString}}</view>
 		</view>
 	</view>
 	<view wx:if="{{integral > 0 }}" class="view-margin" style="text-align: right;margin-top: 35rpx;">
-		减少{{integral}}云币 <dk-tip slot="label-icon" style="display: inline-block;" id="tipIntegral" Up="{{true}}" Left="{{true}}" tipContent='每{{integralTacticItem.exchangeRate}}云币等于1人民币' bind:clickTip="closeAllTips"/> 
+		减少{{integral}}云币
+		<dk-tip slot="label-icon" style="display: inline-block;" id="tipIntegral" Up="{{true}}" Left="{{true}}" tipContent='每{{integralTacticItem.exchangeRate}}云币等于1人民币' bind:clickTip="closeAllTips" />
 	</view>
 	<view wx:if="{{couponList.length > 0 && factAmt > 0 }}" class="view-margin" style="text-align: right;margin-top: 35rpx;">
 		使用{{couponUse.discount}}折优惠券

package-business-analysis/pages/business-overview-experience/business-overview-experience.js

@@ -14,6 +14,14 @@ Page({
         funData: [],
         userEndDate: null,
         userEndDateFlg: false,
+        factAmt: 0,
+        routeObjName: 'company',
+        integral: 0,
+        viewHeight: 302,
+        couponList: [],
+        couponUse: {},
+        // 策略
+        integralTacticItem: {},
     },
 
     /**
@@ -26,16 +34,71 @@ Page({
                 userEndDate: app.globalData.company.userEndDate
             })
         }
-        // 查询活动
-        this.getActivity()
+        // // 查询活动
+        // this.getActivity()
+        // 优惠券 积分 一个函数查询
+        this.getCouponUse()
 
     },
 
     /**
-     * @desc : 服务器的日期
-     * @author : 姜永辉
-     * @date : 2024/4/1
-     */
+  * @desc : 关闭所有的tip
+  * @date : 2024/5/24 15:49
+  * @author : 王英杰
+  */
+    closeAllTips() {
+        this.closeTips(['tipIntegral', 'tipOrd'])
+    },
+
+    /**
+    * @desc :  优惠劵数量获取 积分策略  积分 
+    * @author : 刘尧
+    * @date : 2024/7/29 15:54
+    */
+    getCouponUse() {
+        let params = {
+            couponStatus: Constants.couponStatus.unused,
+            flgValid: true,
+            cpId: app.globalData.company.cpId,
+        }
+        let service = app.globalData['couponUseService']
+        this.excute(service, service.listByCondUse, params).then(res => {
+            if (res.data && res.data.data) {
+                // 优惠劵数量获取 
+                if (res.data.data.list && res.data.data.list.length > 0) {
+                    this.setData({
+                        couponList: res.data.data.list,
+                        couponUse: res.data.data.list[0],
+                        viewHeight: this.data.viewHeight + 40
+                    })
+                }
+                // 积分
+                if (res.data.data.integral) {
+                    this.setData({
+                        integral: res.data.data.integral,
+                        viewHeight: this.data.viewHeight + 40
+                    })
+                }
+                // 积分策略
+                if (res.data.data.listIntegralTactic && res.data.data.listIntegralTactic.length > 0) {
+                    this.setData({
+                        integralTacticItem: res.data.data.listIntegralTactic[0],
+                    })
+                }
+
+            }
+            //查询活动
+            this.getActivity()
+
+        });
+    },
+
+
+    /**
+    * @desc : 服务器的日期
+    * @author : 姜永辉
+    * @date : 2024/4/1
+    */
     getCurrentDate() {
         let _this = this
         let service = app.globalData['commonService']
@@ -44,23 +107,53 @@ Page({
                 //服务器的时间  
                 let nowDate = res.data.data.currentDate
                 let endDate = new Date(nowDate).addMonths(12).addDays(-1).toDateStr()
+                // 积分转成现金                
+                let integralRateVal = Number((_this.data.integral / _this.data.integralTacticItem.exchangeRate).toFixed(2))
+                // 折扣--数据库的值不能超过10
+                let discount = _this.data.couponUse.discount ? _this.data.couponUse.discount / 10 : 1
+                // couponUse.discount / 10              
+
                 // 用户到期日期
                 if (_this.data.userEndDate == null || !_this.data.userEndDate) {
+                    // 积分兑换的大于订单详情的
+                    if (_this.data.integral > Math.ceil(_this.data.integralTacticItem.exchangeRate * _this.data.funData.wxPrice)) {
+                        _this.setData({
+                            factAmt: 0.00,
+                            integral: Math.ceil(_this.data.integralTacticItem.exchangeRate * _this.data.funData.wxPrice)
+                        })
+
+                    } else {
+                        _this.setData({
+                            factAmt: Number((_this.data.funData.wxPrice - integralRateVal) * discount.toFixed(2)),
+                        })
+                    }
                     _this.setData({
                         userEndDate: endDate,
                         userEndDateFlg: true,
                         userEndDateString: _this.data.funData.wxPrice + '元/年(' + _this.data.funData.activityItemDescribe + ')',
-                        factAmt: _this.data.funData.wxPrice,
+                        // factAmt: _this.data.funData.wxPrice,
                         extendDays: 365,
                         nowDate,
                     })
                 } else {
                     // 和 服务器的时间一致
                     if (_this.data.userEndDate == endDate) {
+                        // 积分兑换的大于订单详情的
+                        if (_this.data.integral > Math.ceil(_this.data.integralTacticItem.exchangeRate * _this.data.funData.wxPrice)) {
+                            _this.setData({
+                                factAmt: 0.00,
+                                integral: Math.ceil(_this.data.integralTacticItem.exchangeRate * _this.data.funData.wxPrice)
+                            })
+
+                        } else {
+                            _this.setData({
+                                factAmt: Number((_this.data.funData.wxPrice - integralRateVal) * discount.toFixed(2)),
+                            })
+                        }
                         _this.setData({
                             userEndDateFlg: true,
                             userEndDateString: _this.data.funData.wxPrice + '元/年(' + _this.data.funData.activityItemDescribe + ')',
-                            factAmt: _this.data.funData.wxPrice,
+                            // factAmt: _this.data.funData.wxPrice,
                             extendDays: 365,
                             nowDate,
                         })
@@ -68,12 +161,23 @@ Page({
                         let extendDays = Math.ceil(new Date(_this.data.userEndDate).dayDiff(new Date(nowDate)) + 1);
 
                         let price = (Math.round((_this.data.funData.wxPrice / 365 + Number.EPSILON) * 100) / 100).toFixed(2)
-                        console.log(price);
                         let factAmt = (Number(price) * extendDays).toFixed(2)
-                        this.setData({
+                        // 积分兑换的大于订单详情的
+                        if (_this.data.integral > Math.ceil(_this.data.integralTacticItem.exchangeRate * factAmt)) {
+                            _this.setData({
+                                factAmt: 0.00,
+                                integral: Math.ceil(_this.data.integralTacticItem.exchangeRate * factAmt)
+                            })
+
+                        } else {
+                            _this.setData({
+                                factAmt: Number((factAmt - integralRateVal) * discount.toFixed(2)),
+                            })
+                        }
+                        _this.setData({
                             userEndDateFlg: false,
                             userEndDateString: price + '元/天(' + _this.data.funData.activityItemDescribe + ')* ' + extendDays + '天=' + factAmt + '元',
-                            factAmt: factAmt,
+                            // factAmt: factAmt,
                             extendDays,
                             nowDate,
                         })
@@ -120,10 +224,10 @@ Page({
     },
 
     /**
-* @desc : 设置保存参数
-* @author : 周兴
-* @date : 2024/4/1
-*/
+    * @desc : 设置保存参数
+    * @author : 周兴
+    * @date : 2024/4/1
+    */
     setParams(params) {
         //home的功能包修改此处就需要做相应修改 包括后面的传值
         let funPackage = app.globalData.company.funPackage ? [...app.globalData.company.funPackage] : []
@@ -155,7 +259,12 @@ Page({
             params.vip = true;
         }
         params.buyLong = this.data.extendDays + '天'
-        console.log(params);
+        // 操作员
+        params.staffNameFrom = app.globalData.user.staffName
+        // 优惠券使用id 金额大于0
+        params.couponUseId = this.data.couponUse.useId && Number(this.data.factAmt) > 0
+            ? this.data.couponUse.useId : null
+        params.integral = this.data.integral
         return params;
     },
 
@@ -167,7 +276,7 @@ Page({
     saveData(params) {
         let service = app.globalData['companyService']
         return this.excute(service, service.saveFunc, this.data.params).then(res => {
-            if (res.data.code == Constants.SUCESS_CODE) {
+            if (res.data.code == Constants.SUCESS_CODE && Number(this.data.factAmt) > 0) {
                 // 成功后跳转支付
                 this.toPay(res.data.data);
             }
@@ -192,6 +301,12 @@ Page({
             activityItemId: this.data.funData.itemId,
             extendDays: this.data.extendDays,
             userEndDateString: this.data.userEndDateString,
+            // 操作员
+            staffNameFrom: app.globalData.user.staffName,
+            // 优惠券使用id 金额大于0
+            couponUseId : this.data.couponUse.useId && Number(this.data.factAmt) > 0
+                ? this.data.couponUse.useId : null,
+            integral : this.data.integral,
         }
         //收发存汇总表
         if (type == 'INT') {

package-business-analysis/pages/business-overview-experience/business-overview-experience.wxml

@@ -70,17 +70,21 @@
 </view>
 <view style="height: 400rpx;"></view>
 
-<view class="bottom-class">
+<view class="bottom-class" style="{{'height:' + viewHeight + 'rpx'}}" bind:tap="closeAllTips">
 	<view class="view-margin">
 		<view style="display: flex;justify-content: space-between;align-items: center;">
-			<view>订单详情 
-			<van-icon slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
+			<view>订单详情
+				<dk-tip slot="label-icon" style="display: inline-block;" id="tipOrd" Up="{{true}}" Right="{{true}}" tipContent='账户有效期标准化至统一到期日' bind:clickTip="closeAllTips" />
 			</view>
 			<view>{{userEndDateString}}</view>
 		</view>
 	</view>
-	<view wx:if="{{false}}" class="view-margin" style="text-align: right;margin-top: 35rpx;">
-		减少100积分<van-icon slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
+	<view wx:if="{{integral > 0}}" class="view-margin" style="text-align: right;margin-top: 35rpx;">
+		减少{{integral}}云币
+		<dk-tip slot="label-icon" style="display: inline-block;" id="tipIntegral" Up="{{true}}" Left="{{true}}" tipContent='每{{integralTacticItem.exchangeRate}}云币等于1人民币' bind:clickTip="closeAllTips" />
+	</view>
+	<view wx:if="{{couponList.length > 0 && factAmt > 0 }}" class="view-margin" style="text-align: right;margin-top: 35rpx;">
+		使用{{couponUse.discount}}折优惠券
 	</view>
 	<view class="view-margin" style="display: flex;justify-content:space-between; align-items:center;   ">
 		<view style="display: flex;justify-content: center;align-items: center;">

package-business-analysis/pages/cus-rec-pay-report/cus-rec-pay-report.js

@@ -19,13 +19,13 @@ Page({
    * 页面的初始数据
    */
   data: {
-    initSearchFlag:false,
+    initSearchFlag: false,
     placeholder: "请输入客户名称/电话/地址",
     searchContent: [],
     sortMenuObject: {
-      code: 'sort', 
+      code: 'sort',
       title: 'down',
-      searchType:Constants.searchType.radio, 
+      searchType: Constants.searchType.radio,
       options: [
         {
           "text": "欠款升序",
@@ -42,12 +42,12 @@ Page({
       code: 'recType',
       pullType: 'mSelect',
       typeName: 'recType'
-    },{
+    }, {
       code: 'moneyAccount',
       pullType: 'mSelect',
       typeName: 'moneyAccount'
     }
-  ],
+    ],
     cardDate: [],
     titleData: {},
     otherSearchParams: {
@@ -65,17 +65,17 @@ Page({
    * @author : 刘尧
    */
   getData(params) {
-    if(this.data.params && this.data.params.testFlag){
+    if (this.data.params && this.data.params.testFlag) {
       return
-    }else{
+    } else {
       return this.excute(this.data.service, this.data.service.getCusRecPayReportItem, params);
     }
   },
-    /**
-   * @desc : 处理接口返回数据
-   * @date : 2024/2/1 15:49
-   * @author : 姜永辉
-   */
+  /**
+ * @desc : 处理接口返回数据
+ * @date : 2024/2/1 15:49
+ * @author : 姜永辉
+ */
   handleSearchData(tableData) {
     // 取出前三个元素  
     let firstThree = tableData.slice(0, 3)
@@ -86,15 +86,15 @@ Page({
     // 创建一个 Date 对象，默认为当前日期和时间  
     let now = new Date();
     // 获取年份  
-    let year = now.getFullYear();  
+    let year = now.getFullYear();
     // 获取月份  
-    let month = now.getMonth() + 1;  
+    let month = now.getMonth() + 1;
     month = month < 10 ? '0' + month : month; // 如果月份小于 10，前面补 0  
     // 获取日期
-    let date = now.getDate();  
+    let date = now.getDate();
     date = date < 10 ? '0' + date : date; // 如果日期小于 10，前面补 0  
     // 拼接年月日  
-    let currentDate = year + '-' + month + '-' + date; 
+    let currentDate = year + '-' + month + '-' + date;
     titleData['date'] = currentDate
     this.setData({
       titleData: titleData,
@@ -120,7 +120,7 @@ Page({
    * @date : 2024年7月3日
    * @author : 刘尧
    */
-  toDetail(e){
+  toDetail(e) {
     const route = app.globalData['routeUrl']['customer']
     console.log('open', e.currentTarget.dataset);
     // console.log('url', route.detail.url);
@@ -130,7 +130,7 @@ Page({
       selectflag: true
     })
     //体验跳转显示假数据
-    if(this.data.params && this.data.params.testFlag){
+    if (this.data.params && this.data.params.testFlag) {
       //home的功能包修改此处就需要做相应修改 包括后面的传值
       let params = {
         testFlag: true,
@@ -141,19 +141,24 @@ Page({
         activityId: this.data.params.activityId,
         extendDays: this.data.params.extendDays,
 
-        activityItemId:this.data.params.activityItemId,
-        userEndDateString:this.data.params.userEndDateString,
+        activityItemId: this.data.params.activityItemId,
+        userEndDateString: this.data.params.userEndDateString,
+        // 操作员
+        staffNameFrom: this.data.params.staffNameFrom,
+        // 优惠券使用id 金额大于0
+        couponUseId: this.data.params.couponUseId,
+        integral: this.data.params.integral,
       }
       wx.navigateTo({
         url: route.detail.url,
         success: function (res) {
           // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
-        res.eventChannel.emit('params', {
+          res.eventChannel.emit('params', {
             params: params
-        });
+          });
         }
       })
-    }else{
+    } else {
       wx.navigateTo({
         url: route.detail.url,
         success: function (res) {
@@ -169,13 +174,13 @@ Page({
    * @date : 2024/7/5 15:49
    * @author : 常皓宁
    */
-  loadInit(){
-    if(this.data.params && this.data.params.testFlag){
+  loadInit() {
+    if (this.data.params && this.data.params.testFlag) {
       this.setData({
-        tableData:Data.falseCusRecPayReportData
+        tableData: Data.falseCusRecPayReportData
       })
       this.handleSearchData(this.data.tableData)
-    }else{
+    } else {
       this.searchData();
     }
   },
@@ -185,9 +190,9 @@ Page({
    * @date : 2024/7/10 8:49
    * @author : 常皓宁
    */
-   toBuy(){
-     //home的功能包修改此处就需要做相应修改 包括后面的传值
-     let funPackage = app.globalData.company.funPackage? [...app.globalData.company.funPackage] : []
+  toBuy() {
+    //home的功能包修改此处就需要做相应修改 包括后面的传值
+    let funPackage = app.globalData.company.funPackage ? [...app.globalData.company.funPackage] : []
     let params = {}
     params.endDate = app.globalData.company.endDate
     params.userEndDate = this.data.params.userEndDate
@@ -210,22 +215,27 @@ Page({
     params.activityItemIds = [this.data.params.activityItemId]
 
     funPackage.push({
-        funUuids: this.data.params.funUuids,
-        activityId: this.data.params.activityId,
+      funUuids: this.data.params.funUuids,
+      activityId: this.data.params.activityId,
     })
     params.funPackage = funPackage
     if (app.globalData.company.vip) {
-        params.vip = true;
+      params.vip = true;
     }
     params.buyLong = this.data.params.extendDays + '天'
-    console.log(params);
+    // 操作员
+    params.staffNameFrom = this.data.params.staffNameFrom
+    // 优惠券使用id 金额大于0
+    params.couponUseId = this.data.params.couponUseId
+    params.integral = this.data.params.integral
+
     let service = app.globalData['companyService']
-    return this.excute(service, service.saveFunc,params).then(res => {
-        if (res.data.code == Constants.SUCESS_CODE) {
-            // 成功后跳转支付
-            this.toPay(res.data.data);
-        }
+    return this.excute(service, service.saveFunc, params).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE && Number(this.data.params.factAmt) > 0) {
+        // 成功后跳转支付
+        this.toPay(res.data.data);
+      }
     })
   },
-  
+
 })

package-business-analysis/pages/profit-report/org-rank/org-rank.js

@@ -81,10 +81,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    if(this.data.params && this.data.params.searchForm){
+    if (this.data.params && this.data.params.searchForm) {
       this.setData({
-        searchForm:this.data.params.searchForm,
-        searchContent:this.data.params.searchContent,
+        searchForm: this.data.params.searchForm,
+        searchContent: this.data.params.searchContent,
       })
       this.selectComponent("#menu").changeMenu(this.data.searchContent);
     }
@@ -93,7 +93,7 @@ Page({
   /** 查询页面展示的所有 */
   getReportData() {
     //体验跳转显示假数据
-    if(this.data.params && this.data.params.testFlag){
+    if (this.data.params && this.data.params.testFlag) {
       this.setData({
         tab1TopData: [{ title: '销售利润（总额）', type: 'amount', value: 90000 },
         { title: '利润率', type: '', value: 90.00 + '%' }
@@ -101,7 +101,7 @@ Page({
         tab1TableData: Data.falseOrgProfitData
       })
       return
-    }else{
+    } else {
       this.excute(this.data.service, this.data.service.getSaleProfitGroupByOrg, JSON.parse(this.data.searchForm)).then(res => {
         if (res.data.code == Constants.SUCESS_CODE) {
           this.setData({
@@ -115,14 +115,14 @@ Page({
     }
   },
 
-      /**
-   * @desc : 功能包购买浮钮
-   * @date : 2024/7/10 8:49
-   * @author : 常皓宁
-   */
-  toBuy(){
+  /**
+* @desc : 功能包购买浮钮
+* @date : 2024/7/10 8:49
+* @author : 常皓宁
+*/
+  toBuy() {
     //home的功能包修改此处就需要做相应修改 包括后面的传值
-    let funPackage = app.globalData.company.funPackage? [...app.globalData.company.funPackage] : []
+    let funPackage = app.globalData.company.funPackage ? [...app.globalData.company.funPackage] : []
     let params = {}
     params.endDate = app.globalData.company.endDate
     params.userEndDate = this.data.params.userEndDate
@@ -145,20 +145,25 @@ Page({
     params.activityItemIds = [this.data.params.activityItemId]
 
     funPackage.push({
-        funUuids: this.data.params.funUuids,
-        activityId: this.data.params.activityId,
+      funUuids: this.data.params.funUuids,
+      activityId: this.data.params.activityId,
     })
     params.funPackage = funPackage
     if (app.globalData.company.vip) {
-        params.vip = true;
+      params.vip = true;
     }
     params.buyLong = this.data.params.extendDays + '天'
+    // 操作员
+    params.staffNameFrom = this.data.params.staffNameFrom
+    // 优惠券使用id 金额大于0
+    params.couponUseId = this.data.params.couponUseId
+    params.integral = this.data.params.integral
     let service = app.globalData['companyService']
-    return this.excute(service, service.saveFunc,params).then(res => {
-        if (res.data.code == Constants.SUCESS_CODE) {
-            // 成功后跳转支付
-            this.toPay(res.data.data);
-        }
+    return this.excute(service, service.saveFunc, params).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE && Number(this.data.params.factAmt) > 0) {
+        // 成功后跳转支付
+        this.toPay(res.data.data);
+      }
     })
   },
 })

package-business-analysis/pages/profit-report/profit-report.js

@@ -12,7 +12,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    initSearchFlag:false,
+    initSearchFlag: false,
     service: app.globalData['reportService'],
     // 查询条件
     searchContent: [{
@@ -24,38 +24,38 @@ Page({
     loading: false,
     ec: {},
   },
- /**
-   * @desc : 关闭所有的tip
-   * @date : 2024/5/24 15:49
-   * @author : 王英杰
-   */
-  handleTap(){  
-    if( this.selectComponent('#dk-tip1')){
+  /**
+    * @desc : 关闭所有的tip
+    * @date : 2024/5/24 15:49
+    * @author : 王英杰
+    */
+  handleTap() {
+    if (this.selectComponent('#dk-tip1')) {
       this.selectComponent('#dk-tip1').setShowTipFlag(false)
     }
-    if( this.selectComponent('#dk-tip2')){
+    if (this.selectComponent('#dk-tip2')) {
       this.selectComponent('#dk-tip2').setShowTipFlag(false)
-    } 
+    }
+  },
+  /**
+   * @desc : tip点击事件
+   * @date : 2024/5/24 15:49
+   * @author : 王英杰
+   */
+  clickTip() {
+    this.handleTap()
   },
-    /**
-     * @desc : tip点击事件
-     * @date : 2024/5/24 15:49
-     * @author : 王英杰
-     */
-    clickTip() {
-      this.handleTap() 
-    },
   /**
    * @desc : 查询条件改变 传递到明细中用
    * @date : 2024/7/5 15:49
    * @author : 常皓宁
    */
-  changeSearchContent(e){
-    if(e.detail.item){
+  changeSearchContent(e) {
+    if (e.detail.item) {
       this.setData({
-        searchContent:[{
+        searchContent: [{
           code: "makeTime",
-          defaultValue:e.detail.item.defaultValue,
+          defaultValue: e.detail.item.defaultValue,
           searchType: "date",
           title: e.detail.item.title
         }]
@@ -107,8 +107,13 @@ Page({
         activityId: this.data.params.activityId,
         extendDays: this.data.params.extendDays,
 
-        activityItemId:this.data.params.activityItemId,
-        userEndDateString:this.data.params.userEndDateString,
+        activityItemId: this.data.params.activityItemId,
+        userEndDateString: this.data.params.userEndDateString,
+        // 操作员
+        staffNameFrom: this.data.params.staffNameFrom,
+        // 优惠券使用id 金额大于0
+        couponUseId: this.data.params.couponUseId,
+        integral: this.data.params.integral,
       }
     }
     params.searchForm = this.data.searchForm
@@ -118,7 +123,7 @@ Page({
       success: function (res) {
         //体验跳转显示假数据
         res.eventChannel.emit('params', {
-            params: params
+          params: params
         });
       }
     })
@@ -161,74 +166,74 @@ Page({
   /** 查询页面展示的所有 */
   getSaleProfit() {
     //体验不走查询
-    if(this.data.params && this.data.params.testFlag){
+    if (this.data.params && this.data.params.testFlag) {
       return
-    }else{
-    //如果是跳转过来的star
-    if(this.data.item){
-      this.setData({
-        searchForm:JSON.stringify({
-          makeTimeStart:this.data.item.makeTimeStart,
-          makeTimeEnd:this.data.item.makeTimeEnd
-        }),
-        searchContent:[{
-          code: 'makeTime',
-          defaultValue: this.data.item.title.value,
-          searchType: Constants.searchType.date,
-          title:this.data.item.title.text
-        }]
-      })
-      this.selectComponent("#menu").changeMenu(this.data.searchContent);
-      this.data.item = null
-    }
-    //end
-    this.setData({
-      loading: true
-    })
-    this.excute(this.data.service, this.data.service.getSaleProfit, Object.assign({
-      byDate: this.data.byDate
-    }, JSON.parse(this.data.searchForm))).then(res => {
-      if (res.data.code == Constants.SUCESS_CODE) {
+    } else {
+      //如果是跳转过来的star
+      if (this.data.item) {
         this.setData({
-          profit: res.data.data.profit,
+          searchForm: JSON.stringify({
+            makeTimeStart: this.data.item.makeTimeStart,
+            makeTimeEnd: this.data.item.makeTimeEnd
+          }),
+          searchContent: [{
+            code: 'makeTime',
+            defaultValue: this.data.item.title.value,
+            searchType: Constants.searchType.date,
+            title: this.data.item.title.text
+          }]
         })
-
-        /** 图形重新渲染 */
-        setTimeout(() => {
-          this.setEcharts('echartsProfitDate', { data: res.data.data.dateProfit, labelKey: 'accDate', valueKey: 'profit', type: 1 })
-          this.setEcharts('echartsProfitOrg', { data: res.data.data.orgProfit, labelKey: 'orgName', valueKey: 'profit', type: 3 })
-          this.setEcharts('echartsProfitStaff', { data: res.data.data.staffProfit, labelKey: 'staffName', valueKey: 'profit', type: 3 })
-          this.setEcharts('echartsProfitSku', { data: res.data.data.skuProfit, labelKey: 'skuName', valueKey: 'profit', type: 3 })
-        }, 1000)
-
+        this.selectComponent("#menu").changeMenu(this.data.searchContent);
+        this.data.item = null
       }
+      //end
       this.setData({
-        loading: false
+        loading: true
+      })
+      this.excute(this.data.service, this.data.service.getSaleProfit, Object.assign({
+        byDate: this.data.byDate
+      }, JSON.parse(this.data.searchForm))).then(res => {
+        if (res.data.code == Constants.SUCESS_CODE) {
+          this.setData({
+            profit: res.data.data.profit,
+          })
+
+          /** 图形重新渲染 */
+          setTimeout(() => {
+            this.setEcharts('echartsProfitDate', { data: res.data.data.dateProfit, labelKey: 'accDate', valueKey: 'profit', type: 1 })
+            this.setEcharts('echartsProfitOrg', { data: res.data.data.orgProfit, labelKey: 'orgName', valueKey: 'profit', type: 3 })
+            this.setEcharts('echartsProfitStaff', { data: res.data.data.staffProfit, labelKey: 'staffName', valueKey: 'profit', type: 3 })
+            this.setEcharts('echartsProfitSku', { data: res.data.data.skuProfit, labelKey: 'skuName', valueKey: 'profit', type: 3 })
+          }, 1000)
+
+        }
+        this.setData({
+          loading: false
+        })
       })
-    })
     }
   },
 
-   /**
-    * 显示tip
-    */
-    showTip(e) {
-      let item = e.currentTarget.dataset.item
-      if (item) {
-        util.showToast(item);
-      }
-    },
+  /**
+   * 显示tip
+   */
+  showTip(e) {
+    let item = e.currentTarget.dataset.item
+    if (item) {
+      util.showToast(item);
+    }
+  },
 
   /**
    * @desc : 初始加载
    * @date : 2024/7/5 15:49
    * @author : 常皓宁
    */
-  loadInit(){
-    if(this.data.params && this.data.params.testFlag){
+  loadInit() {
+    if (this.data.params && this.data.params.testFlag) {
       let data = Data.falseProfitReportData
       this.setData({
-        profit:data.profit,
+        profit: data.profit,
       })
       /** 图形重新渲染 */
       setTimeout(() => {
@@ -237,19 +242,19 @@ Page({
         this.setEcharts('echartsProfitStaff', { data: data.staffProfit, labelKey: 'staffName', valueKey: 'profit', type: 3 })
         this.setEcharts('echartsProfitSku', { data: data.skuProfit, labelKey: 'skuName', valueKey: 'profit', type: 3 })
       }, 1000)
-    }else{
+    } else {
       this.getSaleProfit()
     }
   },
 
-    /**
-   * @desc : 功能包购买浮钮
-   * @date : 2024/7/10 8:49
-   * @author : 常皓宁
-   */
-  toBuy(){
+  /**
+ * @desc : 功能包购买浮钮
+ * @date : 2024/7/10 8:49
+ * @author : 常皓宁
+ */
+  toBuy() {
     //home的功能包修改此处就需要做相应修改 包括后面的传值
-    let funPackage = app.globalData.company.funPackage? [...app.globalData.company.funPackage] : []
+    let funPackage = app.globalData.company.funPackage ? [...app.globalData.company.funPackage] : []
     let params = {}
     params.endDate = app.globalData.company.endDate
     params.userEndDate = this.data.params.userEndDate
@@ -272,20 +277,25 @@ Page({
     params.activityItemIds = [this.data.params.activityItemId]
 
     funPackage.push({
-        funUuids: this.data.params.funUuids,
-        activityId: this.data.params.activityId,
+      funUuids: this.data.params.funUuids,
+      activityId: this.data.params.activityId,
     })
     params.funPackage = funPackage
     if (app.globalData.company.vip) {
-        params.vip = true;
+      params.vip = true;
     }
     params.buyLong = this.data.params.extendDays + '天'
+    // 操作员
+    params.staffNameFrom = this.data.params.staffNameFrom
+    // 优惠券使用id 金额大于0
+    params.couponUseId = this.data.params.couponUseId
+    params.integral = this.data.params.integral
     let service = app.globalData['companyService']
-    return this.excute(service, service.saveFunc,params).then(res => {
-        if (res.data.code == Constants.SUCESS_CODE) {
-            // 成功后跳转支付
-            this.toPay(res.data.data);
-        }
+    return this.excute(service, service.saveFunc, params).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE && Number(this.data.params.factAmt) > 0) {
+        // 成功后跳转支付
+        this.toPay(res.data.data);
+      }
     })
   },
 })

package-business-analysis/pages/profit-report/sku-rank/sku-rank.js

@@ -81,10 +81,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    if(this.data.params && this.data.params.searchForm){
+    if (this.data.params && this.data.params.searchForm) {
       this.setData({
-        searchForm:this.data.params.searchForm,
-        searchContent:this.data.params.searchContent,
+        searchForm: this.data.params.searchForm,
+        searchContent: this.data.params.searchContent,
       })
       this.selectComponent("#menu").changeMenu(this.data.searchContent);
     }
@@ -93,7 +93,7 @@ Page({
   /** 查询页面展示的所有 */
   getReportData() {
     //体验跳转显示假数据
-    if(this.data.params && this.data.params.testFlag){
+    if (this.data.params && this.data.params.testFlag) {
       this.setData({
         tab1TopData: [{ title: '销售利润（总额）', type: 'amount', value: 90000 },
         { title: '利润率', type: '', value: 90.00 + '%' }
@@ -101,7 +101,7 @@ Page({
         tab1TableData: Data.falseSkuProfitData
       })
       return
-    }else{
+    } else {
       this.excute(this.data.service, this.data.service.getSaleProfitGroupBySku, JSON.parse(this.data.searchForm)).then(res => {
         if (res.data.code == Constants.SUCESS_CODE) {
           this.setData({
@@ -114,15 +114,15 @@ Page({
       })
     }
   },
-  
+
   /**
    * @desc : 功能包购买浮钮
    * @date : 2024/7/10 8:49
    * @author : 常皓宁
    */
-  toBuy(){
+  toBuy() {
     //home的功能包修改此处就需要做相应修改 包括后面的传值
-    let funPackage = app.globalData.company.funPackage? [...app.globalData.company.funPackage] : []
+    let funPackage = app.globalData.company.funPackage ? [...app.globalData.company.funPackage] : []
     let params = {}
     params.endDate = app.globalData.company.endDate
     params.userEndDate = this.data.params.userEndDate
@@ -145,20 +145,25 @@ Page({
     params.activityItemIds = [this.data.params.activityItemId]
 
     funPackage.push({
-        funUuids: this.data.params.funUuids,
-        activityId: this.data.params.activityId,
+      funUuids: this.data.params.funUuids,
+      activityId: this.data.params.activityId,
     })
     params.funPackage = funPackage
     if (app.globalData.company.vip) {
-        params.vip = true;
+      params.vip = true;
     }
     params.buyLong = this.data.params.extendDays + '天'
+    // 操作员
+    params.staffNameFrom = this.data.params.staffNameFrom
+    // 优惠券使用id 金额大于0
+    params.couponUseId = this.data.params.couponUseId
+    params.integral = this.data.params.integral
     let service = app.globalData['companyService']
-    return this.excute(service, service.saveFunc,params).then(res => {
-        if (res.data.code == Constants.SUCESS_CODE) {
-            // 成功后跳转支付
-            this.toPay(res.data.data);
-        }
+    return this.excute(service, service.saveFunc, params).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE && Number(this.data.params.factAmt) > 0) {
+        // 成功后跳转支付
+        this.toPay(res.data.data);
+      }
     })
   },
 })

package-business-analysis/pages/profit-report/staff-rank/staff-rank.js

@@ -159,9 +159,14 @@ Page({
         params.vip = true;
     }
     params.buyLong = this.data.params.extendDays + '天'
+     // 操作员
+     params.staffNameFrom = this.data.params.staffNameFrom
+     // 优惠券使用id 金额大于0
+     params.couponUseId = this.data.params.couponUseId
+     params.integral = this.data.params.integral
     let service = app.globalData['companyService']
     return this.excute(service, service.saveFunc,params).then(res => {
-        if (res.data.code == Constants.SUCESS_CODE) {
+        if (res.data.code == Constants.SUCESS_CODE && Number(this.data.params.factAmt) > 0) {
             // 成功后跳转支付
             this.toPay(res.data.data);
         }

package-inventory/pages/ivt-sum-report/ivt-sum-report.js

@@ -18,7 +18,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    initSearchFlag:false,
+    initSearchFlag: false,
     // 路由
     routeObjName: 'report',
     // 查询条件
@@ -51,63 +51,64 @@ Page({
     ],
     // 列表区（内容）
     contentList: [
-      { 
-        label: '期初', 
-        code: 'openingIvtQty', 
+      {
+        label: '期初',
+        code: 'openingIvtQty',
         image: 'order-bg',
         // 详情
         itemList: [
           {
-            label:'数量',
-            code:'openingIvtQty',
+            label: '数量',
+            code: 'openingIvtQty',
             dataType: 'string'
-          },{
+          }, {
             label: '金额',
             code: 'openingIvtAmt',
             dataType: 'number'
           }
-      ]},
-      { 
-        label: '入库', 
-        code: 'currentIntoQty', 
+        ]
+      },
+      {
+        label: '入库',
+        code: 'currentIntoQty',
         image: 'inbound-bg',
         itemList: [{
           label: '数量',
           code: 'currentIntoQty',
           dataType: 'string'
-        },{
+        }, {
           label: '金额',
           code: 'currentIntoAmt',
           dataType: 'number'
-        }] 
+        }]
       },
-      { 
-        label: '出库', 
-        code: 'currentOutQty', 
+      {
+        label: '出库',
+        code: 'currentOutQty',
         image: 'order-bg',
         itemList: [{
           label: '数量',
           code: 'currentOutQty',
           dataType: 'string'
-        },{
+        }, {
           label: '金额',
           code: 'currentOutAmt',
           dataType: 'number'
-        }] 
+        }]
       },
-      { 
-        label: '期末', 
-        code: 'endingIvtQty', 
-        image: 'inbound-bg', 
+      {
+        label: '期末',
+        code: 'endingIvtQty',
+        image: 'inbound-bg',
         itemList: [{
           label: '数量',
           code: 'endingIvtQty',
           dataType: 'string'
-        },{
+        }, {
           label: '金额',
           code: 'endingIvtAmt',
           dataType: 'number'
-        }] 
+        }]
       },
     ],
     accDateStart: null,
@@ -140,9 +141,9 @@ Page({
    * @author : 姜永辉
    */
   getData(params) {
-    if(this.data.params && this.data.params.testFlag){
+    if (this.data.params && this.data.params.testFlag) {
       return
-    }else{
+    } else {
       return this.excute(this.data.service, this.data.service.getIvtSumReport, params);
     }
   },
@@ -152,12 +153,12 @@ Page({
    * @date : 2024/7/5 15:49
    * @author : 常皓宁
    */
-  loadInit(){
-    if(this.data.params && this.data.params.testFlag){
+  loadInit() {
+    if (this.data.params && this.data.params.testFlag) {
       this.setData({
-        tableData:Data.falseIvtSumReportData
+        tableData: Data.falseIvtSumReportData
       })
-    }else{
+    } else {
       this.searchData();
     }
   },
@@ -200,18 +201,23 @@ Page({
         e.detail.item.accDateStart = this.data.accDateStart
         e.detail.item.accDateEnd = this.data.accDateEnd
       }
-      if(this.data.params && this.data.params.testFlag){
+      if (this.data.params && this.data.params.testFlag) {
         //home的功能包修改此处就需要做相应修改 包括后面的传值
         let params = {
-            testFlag: true,
-            userEndDate: this.data.params.userEndDate,
-            factAmt: this.data.params.factAmt,
-            nowDate: this.data.params.nowDate,
-            funUuids: this.data.params.funUuids,
-            activityId: this.data.params.activityId,
-            extendDays: this.data.params.extendDays,
-            activityItemId:this.data.params.activityItemId,
-            userEndDateString:this.data.params.userEndDateString,
+          testFlag: true,
+          userEndDate: this.data.params.userEndDate,
+          factAmt: this.data.params.factAmt,
+          nowDate: this.data.params.nowDate,
+          funUuids: this.data.params.funUuids,
+          activityId: this.data.params.activityId,
+          extendDays: this.data.params.extendDays,
+          activityItemId: this.data.params.activityItemId,
+          userEndDateString: this.data.params.userEndDateString,
+          // 操作员
+          staffNameFrom: this.data.params.staffNameFrom,
+          // 优惠券使用id 金额大于0
+          couponUseId: this.data.params.couponUseId,
+          integral: this.data.params.integral,
         }
         e.detail.item.params = params
       }
@@ -225,9 +231,9 @@ Page({
    * @date : 2024/7/10 8:49
    * @author : 常皓宁
    */
-  toBuy(){
+  toBuy() {
     //home的功能包修改此处就需要做相应修改 包括后面的传值
-    let funPackage = app.globalData.company.funPackage? [...app.globalData.company.funPackage] : []
+    let funPackage = app.globalData.company.funPackage ? [...app.globalData.company.funPackage] : []
     let params = {}
     params.endDate = app.globalData.company.endDate
     params.userEndDate = this.data.params.userEndDate
@@ -249,21 +255,26 @@ Page({
     params.activityItemIds = [this.data.params.activityItemId]
 
     funPackage.push({
-        funUuids: this.data.params.funUuids,
-        activityId: this.data.params.activityId,
+      funUuids: this.data.params.funUuids,
+      activityId: this.data.params.activityId,
     })
     params.funPackage = funPackage
     if (app.globalData.company.vip) {
-        params.vip = true;
+      params.vip = true;
     }
     params.buyLong = this.data.params.extendDays + '天'
+    // 操作员
+    params.staffNameFrom = this.data.params.staffNameFrom
+    // 优惠券使用id 金额大于0
+    params.couponUseId = this.data.params.couponUseId
+    params.integral = this.data.params.integral
     console.log(params);
     let service = app.globalData['companyService']
-    return this.excute(service, service.saveFunc,params).then(res => {
-        if (res.data.code == Constants.SUCESS_CODE) {
-            // 成功后跳转支付
-            this.toPay(res.data.data);
-        }
+    return this.excute(service, service.saveFunc, params).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE && Number(this.data.params.factAmt) > 0) {
+        // 成功后跳转支付
+        this.toPay(res.data.data);
+      }
     })
   },