Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-07-23 375237a59434d61567161131d85229d45c792366

Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

 gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java

@@ -103,7 +103,7 @@
        if (jhyInfo == null || !JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
            return JsonResult.failMessage("不是集货员！");
        }
        jhyService.assignJhyOrder(model);
        jhyService.assignJhyOrder(model,jhyInfo.getUserId());
        OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
                .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("集物员管理-指派订单-" + orderId).build();
        mqUtil.sendApp(build);

 gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java

@@ -163,11 +163,10 @@
        return total;
    }

    public void assignJhyOrder(AssignJhyOrderDto model) {
    public void assignJhyOrder(AssignJhyOrderDto model,String userId) {
        Long orderId = model.getOrderId();
        Long jhyId = model.getJhyId();
        JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
        order.setJhyId(jhyId.toString());
        order.setJhyId(userId);
        order.setStatus(JhyOrder.ORDER_STATUS_IMG);
        jhyOrderMapper.updateByPrimaryKey(order);
    }

 gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml

@@ -101,6 +101,6 @@
    </select>

    <select id="selectJhyInfoByUserId" resultType="com.xzx.gc.entity.JhyInfo">
        select * from xzx_jhy_order where id = #{jhyId}
        select * from xzx_jhy_info where id = #{jhyId}
    </select>
</mapper>

 gc-sys/src/main/resources/mapper/system/BannerMapper.xml

@@ -92,6 +92,7 @@


    <select id="selectSysBanner" resultType="com.xzx.gc.system.vo.SysBannerListVo">

        select * from xzx_sys_banner

        where del_flag = 0

        order by sort ASC

    </select>




 gc-sys/src/main/resources/mapper/system/SysNewsMapper.xml

@@ -4,6 +4,7 @@

    <select id="selectSysNewsListVo" resultType="com.xzx.gc.system.vo.SysNewsListVo">
        select * from xzx_sys_news
        where del_flag=0
        order by sort ASC
    </select>