Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-20 087ede8f67a294d94c1cd8bd2f4cb443d35661bb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComShopOrderDO;
@@ -78,6 +79,13 @@
    R orderStatistics(Long userId);

    /**
     * 商家资金的订单详情
     * @param id 订单id
     * @return
     */
    R capitalDetailByStore(Long id);

    /**
     * 订单发货
     * @param orderShipDTO 订单发货信息
     * @return 发货结果