#feat 调试问题修改2

yanghui

2022-11-25 157a519bf6a77fd4d65db83afac5c59ee136a1ef

#feat 调试问题修改2

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerOrderDeliveryDTO.java

@@ -25,35 +25,35 @@
    /**
     * 自提点id
     */
    @ApiModelProperty(value = "自提点id", required = true)
    @ApiModelProperty(value = "自提点id")
    private Long pointId;

    /**
     * 自提点id
     */
    @ApiModelProperty(value = "自提点名称", required = true)
    @ApiModelProperty(value = "自提点名称")
    private String pointName;

    /**
     * 配送订单数量
     */
    @ApiModelProperty(value = "配送订单数量", required = true)
    @ApiModelProperty(value = "配送订单数量")
    private Integer deliveryOrderNum;

    /**
     * 配送商品数量
     */
    @ApiModelProperty(value = "配送商品数量", required = true)
    @ApiModelProperty(value = "配送商品数量")
    private Integer deliveryGoodsNum;

    /**
     * 价值
     */
    @ApiModelProperty(value = "价值", required = true)
    @ApiModelProperty(value = "价值")
    private BigDecimal deliveryAmount;



    @ApiModelProperty(value = "订单id集合", required = true)
    @ApiModelProperty(value = "订单id集合")
    private List<Long> orderIds;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java

@@ -27,6 +27,9 @@
    @ApiModelProperty(value = "商户id")
    private Long storeId;

    @ApiModelProperty(value = "配送单号")
    private String deliveryNo;

    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderDeliveryVO.java

@@ -80,7 +80,7 @@
     * 自提点名称
     */
    @ApiModelProperty(value = "自提点名称")
    private Long pointName;
    private String pointName;

    /**
     * 配送订单数量

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/OrderNoUtils.java

@@ -22,10 +22,6 @@
    }

    public static String NextOrderNoFlower(Long userId) {
        if (sn == 999)
            sn = 0;
        else
            sn++;
        DateFormat df = new SimpleDateFormat("MMddHHmmss");
        return df.format(new Date()) + padRight(String.valueOf(userId), 3, '0')
                + getRandomNumber();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDeliveryDO.java

@@ -75,7 +75,7 @@
     * 自提点名称
     */
    @TableField(value = "point_name")
    private Long pointName;
    private String pointName;

    /**
     * 配送订单数量

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java

@@ -43,7 +43,6 @@
 */
@Service
@Slf4j
@Transactional(rollbackFor = Exception.class)
public class ComShopFlowerGoodsServiceImpl extends ServiceImpl<ComShopFlowerGoodsDAO, ComShopFlowerGoodsDO> implements ComShopFlowerGoodsService {

    @Resource
@@ -62,6 +61,7 @@
    private ComShopFlowerGoodsViewStatisticsDAO comShopFlowerGoodsViewStatisticsDAO;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R saveShopFlowerGoods(AddShopFlowerGoodsVO addShopFlowerGoodsVO) {
        if (addShopFlowerGoodsVO == null) {
            return R.ok("500", "数据为空！");
@@ -234,6 +234,7 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R editFlowerShopGoods(Long id, AddShopFlowerGoodsVO addShopFlowerGoodsVO) {
        if (addShopFlowerGoodsVO == null) {
            return R.ok("500", "数据为空！");
@@ -303,6 +304,7 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R deleteShopFlowerGoods(Long id) {
        ComShopFlowerGoodsDO comShopFlowerGoodsDO = this.baseMapper.selectById(id);
        comShopFlowerGoodsDO.setDeleteStatus(ComShopFlowerGoodsDO.deleteStatus.yes);
@@ -311,6 +313,7 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R changeStatus(Long id, Integer status) {
        ComShopFlowerGoodsDO shopGoodsDO = this.baseMapper.selectById(id);
        if (shopGoodsDO == null) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java

@@ -39,7 +39,6 @@
 */
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class ComShopFlowerOrderDeliveryServiceImpl extends ServiceImpl<ComShopFlowerOrderDeliveryDAO, ComShopFlowerOrderDeliveryDO>
        implements ComShopFlowerOrderDeliveryService {

@@ -50,6 +49,7 @@


    @Override
    @Transactional(rollbackFor = Exception.class)
    public R saveDelivery(ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
        ComShopFlowerOrderDeliveryDO comShopFlowerOrderDeliveryDO = new ComShopFlowerOrderDeliveryDO();
        BeanUtils.copyProperties(comShopFlowerOrderDeliveryDTO,comShopFlowerOrderDeliveryDO);
@@ -71,6 +71,7 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R updateDelivery(ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
        Long id = comShopFlowerOrderDeliveryDTO.getId();
        if (null == id){

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderPayServiceImpl.java

@@ -19,7 +19,6 @@
 * @Description: 流水
 */
@Service
@Transactional(rollbackFor = Exception.class)
public class ComShopFlowerOrderPayServiceImpl extends ServiceImpl<ComShopFlowerOrderPayDAO, ComShopFlowerOrderPayDO> implements ComShopFlowerOrderPayService {

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java

@@ -40,7 +40,6 @@
 */
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class ComShopFlowerOrderServiceImpl extends ServiceImpl<ComShopFlowerOrderDAO, ComShopFlowerOrderDO>
        implements ComShopFlowerOrderService {

@@ -565,6 +564,7 @@
     * @return 删除结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R orderDelete(Long orderId) {
        // 查询订单
        ComShopFlowerOrderDO shopOrderDO = this.baseMapper.selectById(orderId);
@@ -870,6 +870,8 @@
     * @param orderPayDTO 请求参数
     * @return 支付对象
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R wxPay(OrderPayDTO orderPayDTO) {
        // 创建返回参数
        ComShopFlowerOrderVO shopOrderVO = new ComShopFlowerOrderVO();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java

@@ -40,7 +40,6 @@
 */
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class ComShopFlowerRefundOrderServiceImpl extends ServiceImpl<ComShopFlowerRefundOrderDAO, ComShopFlowerRefundOrderDO>
        implements ComShopFlowerRefundOrderService {

@@ -71,6 +70,7 @@


    @Override
    @Transactional(rollbackFor = Exception.class)
    public R createRefundOrder(ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO) {
        ComShopFlowerRefundOrderDO comShopFlowerRefundOrderDO = new ComShopFlowerRefundOrderDO();
        BeanUtils.copyProperties(comShopFlowerRefundOrderDTO, comShopFlowerRefundOrderDO);
@@ -121,6 +121,7 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R updateRefundOrder(ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO) {
        ComShopFlowerRefundOrderDO comShopFlowerRefundOrderDO = this.baseMapper.selectById(comShopFlowerRefundOrderDTO.getId());


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerUserAddressServiceImpl.java

@@ -24,7 +24,6 @@
 */
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class ComShopFlowerUserAddressServiceImpl extends ServiceImpl<ComShopFlowerUserAddressDAO, ComShopFlowerUserAddressDO>
    implements ComShopFlowerUserAddressService {


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml

@@ -57,7 +57,8 @@
        select id as orderId,order_no,store_id,`status`,pay_status,receiver_id,total_amount as
        orderTotal,pay_amount,delivery_type,remark,create_at from com_shop_flower_order as cso where 1=1 and
        cso.delete_status = 1 and cso.status = 1 and cso.delivery_type = 1
        <if test='comOrderListDTO.pointId != null'>AND cso.point_id = #{comOrderListDTO.pointId}
        <if test='comOrderListDTO.pointId != null'>
            AND cso.point_id = #{comOrderListDTO.pointId}
        </if>
        order by create_at desc
    </select>
@@ -162,6 +163,9 @@
        <if test="comOrderListDTO.storeId != null">
            and o.store_id = #{comOrderListDTO.storeId}
        </if>
        <if test="comOrderListDTO.deliveryNo != null and comOrderListDTO.deliveryNo != ''">
            and o.delivery_no = #{comOrderListDTO.deliveryNo}
        </if>

    </select>
    <select id="selectCountByDeliveryType"

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDeliveryMapper.xml

@@ -13,7 +13,7 @@
        <result column="service_time" jdbcType="TIMESTAMP" property="serviceTime"/>
        <result column="delivery_type" jdbcType="TINYINT" property="deliveryType"/>
        <result column="point_id" jdbcType="BIGINT" property="pointId"/>
        <result column="point_name" jdbcType="BIGINT" property="pointName"/>
        <result column="point_name" jdbcType="VARCHAR" property="pointName"/>
        <result column="delivery_order_num" jdbcType="INTEGER" property="deliveryOrderNum"/>
        <result column="delivery_goods_num" jdbcType="INTEGER" property="deliveryGoodsNum"/>
        <result column="delivery_amount" jdbcType="DECIMAL" property="deliveryAmount"/>