Merge remote-tracking branch 'origin/api' into api

935090232@qq.com

2021-01-17 29ba6fbd0015b9a77b5c994f43429a5a42e2ecc4

Merge remote-tracking branch 'origin/api' into api

 zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java

@@ -64,7 +64,7 @@
            QueryUtil.setQueryLimitCom(achieveNew);
            achieveNew.setType(rankingDto.getType());
            achieveNew.setDatatime(new Date());
            List<RankingVo> list = achieveNewDao.selectStaffSaleAchieveRanking(achieveNew);
            List<RankingVo> list = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew);
            ajaxResult.setRows(list);
        } else {
            AchieveNew achieveNew = new AchieveNew();

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java

@@ -186,6 +186,7 @@
            achieveNew.setServiceOrderId(projServices.getId());
            achieveNew.setOrderItemId(beauticianState.getId());
            achieveNew.setShopId(projServices.getShopId());
            achieveNew.setCompanyId(projServices.getCompanyId());
            achieveNew.setShoppingGoodsId(projUse.getProjId());
            achieveNew.setNumberOfPeople(1D / size);
            achieveNew.setProjNum(1);
@@ -257,6 +258,7 @@
        achieveNew.setOrderId(pageOrder.getId());
        achieveNew.setOrderItemId(orderItem.getId());
        achieveNew.setShopId(pageOrder.getShopId());
        achieveNew.setCompanyId(pageOrder.getCompanyId());
        achieveNew.setShoppingGoodsId(orderItem.getGoodsId());
        // 是否赠送
        achieveNew.setT2(orderItem.getIsFree());

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java

@@ -400,7 +400,7 @@


        // 设置成功状态
        projServices.setState(Dictionary.SERVICE_STATU_YYCG);
        projServices.setState(Dictionary.SERVICE_STATU_XPL);
        // 判断当前门店是否有历史美疗师
        LastestWorkBeatuistaff lastWorkStaff = new LastestWorkBeatuistaff();
        lastWorkStaff.setShopId(checkProjServices.getShopId());
@@ -578,6 +578,8 @@
            projServices.setState(Dictionary.SERVICE_STATU_FFJS);
            projServices.setConsumeTime(new Date());
            int result=sysProjServicesDao.update(projServices);
            achieveNewService.addAchieveByServiceOrder(projServices);

            //发送微信公众号提醒
            UniformMsgParam uniformMsgParam=new UniformMsgParam(projServices.getCompanyId(),UniformMsgParam.GZH_FWWC);
            uniformMsgParam.put("serviceId",projServices.getId());

 zq-erp/src/main/resources/config/application.properties

@@ -1,4 +1,4 @@
evn=ffff
evn=dev
server.port=8080



 zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml

@@ -625,7 +625,7 @@
                #{item.beginTime} dataTime,
                (select shop_short_name from sys_shop_info where id=#{shopId}) shopName,
                (select IFNULL(sum(amount),0) from sys_order_flow
                    where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
                    where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]> and pay_method!='欠款'
                    <if test="shopId != null">
                        and shop_id=#{shopId}
                    </if>
@@ -678,29 +678,29 @@
                        and company_id=#{companyId}
                    </if>
                    ) refundCardPay,
                (select IFNULL(sum(amount),0) from sys_order_flow a
                    inner join sys_order_item b on a.order_id=b.ORDER_ID
                    inner join shopping_goods c on b.goods_id=c.id
                    where c.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
                (select IFNULL(sum(zk_price),0) from sys_order_item a
                    inner join shopping_goods b on a.goods_id=b.id
                    inner join sys_order c on a.ORDER_ID=c.id
                    where b.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
                    <if test="shopId != null">
                        and a.shop_id=#{shopId}
                        and c.shop_id=#{shopId}
                    </if>
                    <if test="companyId != null">
                        and a.company_id=#{companyId}
                        and c.company_id=#{companyId}
                    </if>
                    ) productAchieve,
                (select IFNULL(sum(amount),0) from sys_order_flow a
                    inner join sys_order_item b on a.order_id=b.ORDER_ID
                    inner join shopping_goods c on b.goods_id=c.id
                    where c.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
                (select IFNULL(sum(zk_price),0) from sys_order_item a
                    inner join shopping_goods b on a.goods_id=b.id
                    inner join sys_order c on a.ORDER_ID=c.id
                    where b.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
                    <if test="shopId != null">
                        and a.shop_id=#{shopId}
                        and c.shop_id=#{shopId}
                    </if>
                    <if test="companyId != null">
                        and a.company_id=#{companyId}
                        and c.company_id=#{companyId}
                    </if>
                    ) cardAchieve,
                (select IFNULL(sum(amount),0) from sys_order_flow where flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
                (select IFNULL(sum(amount),0) from sys_order_flow where flow_type = '还款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
                    <if test="shopId != null">
                        and shop_id=#{shopId}
                    </if>
@@ -805,7 +805,7 @@
            select
            #{item.beginTime} dataTime,
            (select IFNULL(sum(amount),0) from sys_order_flow
            where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
            where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]> and pay_method!='欠款'
            <if test="shopId != null">
                and shop_id=#{shopId}
            </if>
@@ -840,20 +840,20 @@
                and shop_id=#{shopId}
            </if>
            ) refundCardPay,
            (select IFNULL(sum(amount),0) from sys_order_flow a
            inner join sys_order_item b on a.order_id=b.ORDER_ID
            inner join shopping_goods c on b.goods_id=c.id
            where c.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
            (select IFNULL(sum(zk_price),0) from sys_order_item a
            inner join shopping_goods b on a.goods_id=b.id
            inner join sys_order c on a.ORDER_ID=c.id
            where b.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
            <if test="shopId != null">
                and a.shop_id=#{shopId}
                and c.shop_id=#{shopId}
            </if>
            ) productAchieve,
            (select IFNULL(sum(amount),0) from sys_order_flow a
            inner join sys_order_item b on a.order_id=b.ORDER_ID
            inner join shopping_goods c on b.goods_id=c.id
            where c.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
            (select IFNULL(sum(zk_price),0) from sys_order_item a
            inner join shopping_goods b on a.goods_id=b.id
            inner join sys_order c on a.ORDER_ID=c.id
            where b.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
            <if test="shopId != null">
                and a.shop_id=#{shopId}
                and c.shop_id=#{shopId}
            </if>
            ) cardAchieve,
            (select IFNULL(sum(amount),0) from sys_order_flow where flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>

 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml

@@ -18,6 +18,7 @@
        <result property="statu" column="STATU"/>
        <result property="zkTotal" column="ZK_TOTAL"/>
        <result property="shopId" column="SHOP_ID"/>
        <result property="companyId" column="company_id"/>
        <result property="vipName" column="VIP_NAME"/>
        <result property="vipNo" column="VIP_NO"/>
        <result property="staffName" column="STAFF_NAME"/>

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html

@@ -681,7 +681,7 @@
                                        item.payMoney = item.zkPrice;
                                    }
                                    orderPayMoney += item.payMoney;

                                    item.uuid = MTools.uuid();
                                    //业绩设置
                                    _this.achieveList.push({
                                        orderItem: item,

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html

@@ -305,9 +305,9 @@
    btns[0]='<a  class="text-primary mr-5" onClick="openPb(\'VALUE\')"  title="排班"><i class="fa fa-calendar">排班</i></a>&nbsp;'
</script>

<script matrix:btn="serviceClub-paidan"  >
    btns[1]='<a  class="text-primary mr-5" onClick="openPd(\'VALUE\')"  title="派单"><i class="fa fa-sign-in">派单</i></a>'
</script>
<!--<script matrix:btn="serviceClub-paidan"  >-->
<!--    btns[1]='<a  class="text-primary mr-5" onClick="openPd(\'VALUE\')"  title="派单"><i class="fa fa-sign-in">派单</i></a>'-->
<!--</script>-->

<script matrix:btn="serviceClub-edit"  >
    btns[2]='<a  class="text-primary mr-5" onClick="updatePd(\'VALUE\')"  title="修改"><i class="fa fa-edit">修改</i></a>'