20210812

xiaoyong931011

2021-08-12 a5ffab1fcc28ad45a56e376722c162d23742848e

20210812

 zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopDeliveryInfoAction.java

@@ -83,8 +83,8 @@
        SysUsers sysUsers = getMe();
        pageVo.setSort("create_time");
        pageVo.setOrder("desc");
//        shopDeliveryInfo.setCompanyId(sysUsers.getCompanyId());
        shopDeliveryInfo.setShopId(sysUsers.getShopId());
        shopDeliveryInfo.setCompanyId(sysUsers.getCompanyId());
//        shopDeliveryInfo.setShopId(sysUsers.getShopId());
        List<ShopDeliveryInfo> dataList = shopDeliveryInfoDao.selectInPage(shopDeliveryInfo, pageVo);
        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList,
                shopDeliveryInfoDao.selectTotalRecord(shopDeliveryInfo));
@@ -160,6 +160,7 @@
        info.setRemarks(deliveryInfo.getRemarks());
        info.setLogisticsStatus(AppConstance.LOGISTICS_STATUS_OF_RECEIVE);
        info.setDeliveryTime(new Date());
        info.setCompanyId(user.getCompanyId());
        shopDeliveryInfoDao.updateByModel(info);

        //构建需要修改订单信息Map

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopDeliveryInfoDao.xml

@@ -271,6 +271,9 @@
            <if test="record.shopId != null ">
                shop_id  = #{record.shopId},
            </if>
            <if test="record.companyId != null ">
                company_id  = #{record.companyId},
            </if>
        </set>
        WHERE id=#{record.id}
    </update>