联合丽格改版

src/main/java/com/caimei/CaimeiMallAdminApplication.java

@@ -27,7 +27,7 @@ public class CaimeiMallAdminApplication {
     @Bean
     MultipartConfigElement multipartConfigElement() {
         MultipartConfigFactory factory = new MultipartConfigFactory();
-        factory.setLocation("/mnt/newdatadrive/data/runtime/jar-instance/mall-admin/tempImage");
+        factory.setLocation("/mnt/newdatadrive/data/runtime/jar-instance/mall/tempImage");
         return factory.createMultipartConfig();
     }
 }

src/main/java/com/caimei/modules/order/controller/OrderDeliverController.java

@@ -1,8 +1,8 @@
 package com.caimei.modules.order.controller;
 
+import com.caimei.modules.order.entity.CompanyVo;
 import com.caimei.modules.order.entity.DeliverDto;
 import com.caimei.modules.order.entity.LogisticsInfoVo;
-import com.caimei.modules.order.entity.LogisticsRecord;
 import com.caimei.modules.order.entity.NewOrder;
 import com.caimei.modules.order.service.OrderDeliverService;
 import com.caimei.utils.ResponseJson;
@@ -37,7 +37,7 @@ public class OrderDeliverController {
 
     @ApiOperation("确认发货")
     @PostMapping("/confirm/deliver")
-    public ResponseJson confirmDeliver(DeliverDto dto) {
+    public ResponseJson confirmDeliver(@RequestBody DeliverDto dto) {
         return deliverService.confirmDeliver(dto);
     }
 
@@ -46,4 +46,11 @@ public class OrderDeliverController {
     public ResponseJson<List<LogisticsInfoVo>> logisticsDetails(@PathVariable("orderId") Integer orderId) {
         return deliverService.findDetails(orderId);
     }
+
+    @ApiOperation("物流公司")
+    @ApiImplicitParam(required = false, name = "value", value = "快递公司")
+    @GetMapping("/ship/company")
+    public ResponseJson<List<CompanyVo>> getLogisticsCompany(String value) {
+        return deliverService.getLogisticsCompany(value);
+    }
 }

src/main/java/com/caimei/modules/order/controller/OrganizeOrderController.java

@@ -5,6 +5,11 @@ import com.caimei.modules.club.entity.Page;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.service.*;
 import com.caimei.utils.JsonModel;
+import com.caimei.utils.ResponseJson;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Assert;
@@ -12,9 +17,8 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 
-/**
- * 组织订单
- */
+
+@Api(tags = "订单api")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping(value = "/order/organize")
@@ -30,8 +34,6 @@ public class OrganizeOrderController {
 
     private final CmDiscernReceiptService cmDiscernReceiptService;
 
-    private final NewShopOrderService newShopOrderService;
-
     @ModelAttribute
     public NewOrder getOrder(@RequestParam(required = false) String id) {
         NewOrder entity = null;
@@ -44,10 +46,21 @@ public class OrganizeOrderController {
         return entity;
     }
 
+    @ApiOperation("更改收款状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(required = true, name = "orderId", value = "订单Id"),
+            @ApiImplicitParam(required = true, name = "amount", value = "本次收款金额"),
+            @ApiImplicitParam(required = true, name = "status", value = "订单收款状态 2部分收款 3已收款")
+    })
+    @GetMapping("/check/receipt")
+    public ResponseJson checkReceipt(Double amount, Integer status, Integer orderId) {
+        return newOrderService.checkReceipt(amount, status, orderId);
+    }
+
     /**
-     * 订单列表
      * 查询参数 ：订单Id,订单编号,下单时间/终止时间,买家,收货人,订单状态,收款状态,发货状态,退款状态,待审核退款
      */
+    @ApiOperation("订单列表")
     @GetMapping("orderList")
     public JsonModel orderList(NewOrder order, Page page) {
         Assert.assertNotNull("组织id不能为空！", order.getOrganizeId());
@@ -68,9 +81,7 @@ public class OrganizeOrderController {
         return JsonModel.newInstance().success(orderPage);
     }
 
-    /**
-     * 订单详情
-     */
+    @ApiOperation("订单详情")
     @GetMapping("detail")
     public JsonModel detail(NewOrder order) {
         Map<String, Object> map = new HashMap();
@@ -89,7 +100,7 @@ public class OrganizeOrderController {
             order.setApplyReturnedPurchaseFlag("1");
         }
         //判断是否有在收款审核的订单
-        List<Integer> ids = cmReceiptOrderRelationService.toAudit(order.getOrderId());
+        List<Integer> ids = cmReceiptOrderRelationService.toAudit(order);
         if (ids != null && ids.size() > 0) {
             order.setToAudit("1");
         }
@@ -129,10 +140,7 @@ public class OrganizeOrderController {
         return JsonModel.newInstance().success(map);
     }
 
-
-    /**
-     * 收退款记录
-     */
+    @ApiOperation("收退款记录")
     @GetMapping(value = "toRefundRecord")
     public JsonModel toRefundRecord(CmReturnedPurchase cmReturnedPurchase, String from) {
         JsonModel jsonModel = JsonModel.newInstance();
@@ -156,9 +164,7 @@ public class OrganizeOrderController {
         return jsonModel.success(map);
     }
 
-    /**
-     * 退款退货记录
-     */
+    @ApiOperation("退款退货记录")
     @GetMapping(value = "toRecturnRecordByOrderId")
     public JsonModel toRecturnRecordByOrderId(CmReturnedPurchase cmReturnedPurchase) {
         Map<String, Object> map = new HashMap();

src/main/java/com/caimei/modules/order/dao/CmDiscernReceiptDao.java

@@ -28,4 +28,8 @@ public interface CmDiscernReceiptDao {
     List<String> findOrderIds(Integer id);
 
     List<String> hasReceiptRecordOrder(String orderId, Integer id);
+
+    void insertOrderReceipt(ReceiptVo receiptVo);
+
+    void insertOrderRelation(OrderRelationRecord record);
 }

src/main/java/com/caimei/modules/order/dao/LogisticsBatchDao.java

@@ -1,5 +1,6 @@
 package com.caimei.modules.order.dao;
 
+import com.caimei.modules.order.entity.CompanyVo;
 import com.caimei.modules.order.entity.LogisticsBatch;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -12,4 +13,6 @@ public interface LogisticsBatchDao {
     List<LogisticsBatch> findBatch(@Param("orderId")Integer orderId, @Param("logisticsBatchId")String logisticsBatchId);
 
     void insert(LogisticsBatch batch);
+
+    List<CompanyVo> findCompany(String value);
 }

src/main/java/com/caimei/modules/order/dao/LogisticsRecordDao.java

@@ -1,6 +1,5 @@
 package com.caimei.modules.order.dao;
 
-import com.caimei.modules.order.entity.LogisticsInformation;
 import com.caimei.modules.order.entity.LogisticsRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -43,4 +43,10 @@ public interface NewOrderDao {
     String findStatus(Integer orderProductId);
 
     void updateOrderStatus(Integer orderDeliverStatus, String orderStatus, Integer orderId);
+
+    Integer findOutLinePay(Integer orderId);
+
+    List<String> findNotes(Integer orderId);
+
+    void updateReceiptStatus(Integer status, Integer orderId);
 }

src/main/java/com/caimei/modules/order/entity/CompanyVo.java

@@ -0,0 +1,32 @@
+package com.caimei.modules.order.entity;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/8/6
+ */
+@ApiModel(description = "快递公司")
+@Data
+public class CompanyVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 编号
+     */
+    private Integer id;
+
+    /**
+     * 数据值
+     */
+    private String value;
+
+    /**
+     * 标签名
+     */
+    private String label;
+}

src/main/java/com/caimei/modules/order/entity/LogisticsNum.java

@@ -0,0 +1,15 @@
+package com.caimei.modules.order.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@ApiModel(description = "运单号")
+@Data
+public class LogisticsNum {
+    @ApiModelProperty("运单号")
+    private String num;
+}

src/main/java/com/caimei/modules/order/entity/NewOrder.java

@@ -61,6 +61,9 @@ public class NewOrder implements Serializable {
     @ApiModelProperty("订单备注(买家留言)")
     private String note;
 
+    @ApiModelProperty("买家留言")
+    private List<String> notes;
+
     private Integer clubId;
 
     @ApiModelProperty("订单提交时间")
@@ -199,5 +202,12 @@ public class NewOrder implements Serializable {
 
     @ApiModelProperty("有没有收款待审核的订单 , 有的1")
     private String toAudit;
+
+    /**
+     * 当主订单为【待收款】或者为线下支付的【部分收款】状态时，才显示更改订单状态按钮
+     * （排除交易全退订单）
+     */
+    @ApiModelProperty("展示字段：能否更改收款状态 1可以 0不可以")
+    private Integer checkFlag;
 }
 

src/main/java/com/caimei/modules/order/entity/NewOrderProduct.java

@@ -11,7 +11,8 @@ import java.util.List;
 @Data
 public class NewOrderProduct {
 
-
+    @ApiModelProperty("供应商名称")
+    private String shopName;
     @ApiModelProperty("订单商品Id")
     private Integer orderProductId;
     @ApiModelProperty("子订单id")
@@ -88,6 +89,8 @@ public class NewOrderProduct {
     private Integer deliveryNum;
     @ApiModelProperty("未发货数量")
     private Integer notOutStore;
+    @ApiModelProperty("已发货数量")
+    private Integer sendOutNum;
     @ApiModelProperty("成本价")
     private Double costPrice;
     @ApiModelProperty("库存")

src/main/java/com/caimei/modules/order/entity/OrderRelationRecord.java

@@ -35,4 +35,11 @@ public class OrderRelationRecord implements Serializable {
 
     @ApiModelProperty("交易号")
     private String mbOrderId;
+
+    private Integer orderId;
+
+    @ApiModelProperty("关系类型：1返佣订单（返佣款或供应商退款）、2非返佣订单（订单款或者非订单款）、3超级会员款、4二手商品上架费、5认证通会员款")
+    private Integer relationType;
+
+    private Integer receiptId;
 }

src/main/java/com/caimei/modules/order/entity/ReceiptVo.java

@@ -15,6 +15,8 @@ import java.io.Serializable;
 @ApiModel(description= "收款列表实体")
 public class ReceiptVo implements Serializable {
 
+    private Integer id;
+
     @ApiModelProperty("用户付款方式：1线上，2线下")
     private Integer payWay;
     /**
@@ -31,6 +33,9 @@ public class ReceiptVo implements Serializable {
     @ApiModelProperty("收款款项二级类别1.上架费2.订单返佣3.认证通会员4.认证通企划")
     private Integer newReceiptType;
 
+    @ApiModelProperty("收款款项类型：1订单款,2非订单款,3返佣款,5供应商退款,6超级会员款,7二手商品上架费,8优惠券购买费,9认证通会员款")
+    private Integer receiptType;
+
     @ApiModelProperty("关联订单号")
     private String orders;
 

src/main/java/com/caimei/modules/order/entity/Transportation.java

@@ -20,5 +20,5 @@ public class Transportation {
     private String logisticsCompanyCode;
 
     @ApiModelProperty("物流单号")
-    private List<String> logisticsNu;
+    private List<LogisticsNum> logisticsNu;
 }

src/main/java/com/caimei/modules/order/service/CmReceiptOrderRelationService.java

@@ -1,12 +1,13 @@
 package com.caimei.modules.order.service;
 
 import com.caimei.modules.order.entity.CmReceiptOrderRelation;
+import com.caimei.modules.order.entity.NewOrder;
 
 import java.util.List;
 
 public interface CmReceiptOrderRelationService {
 
-    List<Integer> toAudit(Integer orderId);
+    List<Integer> toAudit(NewOrder order);
 
     List<CmReceiptOrderRelation> findByOrderId(Integer orderId);
 }

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -2,10 +2,13 @@ package com.caimei.modules.order.service;
 
 import com.caimei.modules.club.entity.Page;
 import com.caimei.modules.order.entity.NewOrder;
+import com.caimei.utils.ResponseJson;
 
 public interface NewOrderService {
 
     Page<NewOrder> findList(NewOrder newOrder, Page page);
 
     NewOrder get(String id);
+
+    ResponseJson checkReceipt(Double amount, Integer status, Integer orderId);
 }

src/main/java/com/caimei/modules/order/service/NewShopOrderService.java

@@ -9,5 +9,4 @@ public interface NewShopOrderService {
 
     NewShopOrder findByShopOrderId(Integer shopOrderId);
 
-    List<LogisticsInfoVo> logisticsDetails(Integer orderId, String logisticsBatchId);
 }

src/main/java/com/caimei/modules/order/service/OrderDeliverService.java

@@ -1,5 +1,6 @@
 package com.caimei.modules.order.service;
 
+import com.caimei.modules.order.entity.CompanyVo;
 import com.caimei.modules.order.entity.DeliverDto;
 import com.caimei.modules.order.entity.LogisticsInfoVo;
 import com.caimei.modules.order.entity.NewOrder;
@@ -18,4 +19,6 @@ public interface OrderDeliverService {
     ResponseJson confirmDeliver(DeliverDto dto);
 
     ResponseJson<List<LogisticsInfoVo>> findDetails(Integer orderId);
+
+    ResponseJson<List<CompanyVo>> getLogisticsCompany(String value);
 }

src/main/java/com/caimei/modules/order/service/impl/CmReceiptOrderRelationServiceImpl.java

@@ -1,7 +1,9 @@
 package com.caimei.modules.order.service.impl;
 
 import com.caimei.modules.order.dao.CmReceiptOrderRelationDao;
+import com.caimei.modules.order.dao.NewOrderDao;
 import com.caimei.modules.order.entity.CmReceiptOrderRelation;
+import com.caimei.modules.order.entity.NewOrder;
 import com.caimei.modules.order.service.CmReceiptOrderRelationService;
 import com.caimei.utils.ReceivablesType;
 import org.springframework.stereotype.Service;
@@ -14,10 +16,26 @@ public class CmReceiptOrderRelationServiceImpl implements CmReceiptOrderRelation
 
     @Resource
     private CmReceiptOrderRelationDao cmReceiptOrderRelationDao;
+    @Resource
+    private NewOrderDao orderDao;
 
     @Override
-    public List<Integer> toAudit(Integer orderId) {
-        return cmReceiptOrderRelationDao.toAudit(orderId);
+    public List<Integer> toAudit(NewOrder order) {
+        /**
+         *  当主订单为【待收款】或者为线下支付的【部分收款】状态时，才显示更改订单状态按钮
+         *  （排除交易全退订单）
+         */
+        Integer checkFlag = 0;
+        if ("11".equals(order.getStatus()) || "12".equals(order.getStatus()) || "13".equals(order.getStatus())) {
+            checkFlag = 1;
+        } else if ("21".equals(order.getStatus()) || "22".equals(order.getStatus()) || "23".equals(order.getStatus())) {
+            Integer count = orderDao.findOutLinePay(order.getOrderId());
+            checkFlag = count > 0 ? 1 : 0;
+        } else {
+            checkFlag = 0;
+        }
+        order.setCheckFlag(checkFlag);
+        return cmReceiptOrderRelationDao.toAudit(order.getOrderId());
     }
 
     @Override

src/main/java/com/caimei/modules/order/service/impl/NewOrderServiceImpl.java

@@ -6,12 +6,15 @@ import com.caimei.modules.order.dao.*;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.service.NewOrderService;
 import com.caimei.modules.order.service.OrderUserInfoService;
+import com.caimei.modules.order.util.OrderUtils;
 import com.caimei.utils.AppKeys;
 import com.caimei.utils.AppUtils;
 import com.caimei.utils.NewOrderStatus;
+import com.caimei.utils.ResponseJson;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -36,6 +39,8 @@ public class NewOrderServiceImpl implements NewOrderService {
     private CmPayShopRecordDao cmPayShopRecordDao;
     @Resource
     private OrderInvoiceDao orderInvoiceDao;
+    @Resource
+    private OrderUtils orderUtil;
     @Value("${malladmin.domain}")
     private String domain;
 
@@ -161,4 +166,11 @@ public class NewOrderServiceImpl implements NewOrderService {
         }
         return newOrder;
     }
+
+    @Override
+    @Transactional(readOnly = false, rollbackFor = Exception.class)
+    public ResponseJson checkReceipt(Double amount, Integer status, Integer orderId) {
+        orderUtil.addReceiptRecord(amount, status, orderId);
+        return ResponseJson.success();
+    }
 }

src/main/java/com/caimei/modules/order/service/impl/NewShopOrderServiceImpl.java

@@ -59,9 +59,4 @@ public class NewShopOrderServiceImpl implements NewShopOrderService {
         shopOrder.setNewOrderProducts(listAll);
         return shopOrder;
     }
-
-    @Override
-    public List<LogisticsInfoVo> logisticsDetails(Integer orderId, String logisticsBatchId) {
-
-    }
 }

src/main/java/com/caimei/modules/order/service/impl/OrderDeliverServiceImpl.java

@@ -10,9 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import javax.xml.ws.Response;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 
 
 /**
@@ -43,6 +41,7 @@ public class OrderDeliverServiceImpl implements OrderDeliverService {
         orderProducts.forEach(o -> {
             o.setNotOutStore(o.getNotOutStore() - orderProductDao.getActualCancelNum(o.getOrderProductId()));
         });
+        newOrder.setOrderProduct(orderProducts);
         return newOrder;
     }
 
@@ -97,7 +96,7 @@ public class OrderDeliverServiceImpl implements OrderDeliverService {
                 formation.setLogisticsBatchId(batch.getId());
                 formation.setType(4);
                 formation.setOrderId(orderId);
-                formation.setNu(c);
+                formation.setNu(c.getNum());
                 /**
                  * 快递单当前的状态（0：在途，即货物处于运输过程中；
                  * 1：揽件，货物已由快递公司揽收并且产生了第一条跟踪信息；
@@ -136,4 +135,9 @@ public class OrderDeliverServiceImpl implements OrderDeliverService {
         }
         return ResponseJson.success(result);
     }
+
+    @Override
+    public ResponseJson<List<CompanyVo>> getLogisticsCompany(String value) {
+        return ResponseJson.success(logisticsBatchDao.findCompany(value));
+    }
 }

src/main/java/com/caimei/modules/order/util/OrderUtils.java

@@ -293,9 +293,14 @@ public class OrderUtils {
      * @param newOrder
      */
     public void setReceiverVal(NewOrder newOrder) {
+        List<String> notes = newOrderDao.findNotes(newOrder.getOrderId());
+        if (null != notes && notes.size() > 0) {
+            newOrder.setNotes(notes);
+        }
         OrderUserInfo byOrderId = orderUserInfoDao.findByOrderId(newOrder.getOrderId());
         newOrder.setClubName(byOrderId.getName());
-        newOrder.setAddress(byOrderId.getAddress());
+        String address = byOrderId.getProvince() + byOrderId.getCity() + byOrderId.getTown() + byOrderId.getAddress();
+        newOrder.setAddress(address);
         newOrder.setReceiver(byOrderId.getShouHuoRen());
         newOrder.setMobile(byOrderId.getMobile());
     }
@@ -389,7 +394,27 @@ public class OrderUtils {
         }
         orderStatus = orderStatus.substring(0, 1) + orderDeliverStatus.toString();
         //同步更新主订单的发货状态
-        newOrderDao.updateOrderStatus(orderDeliverStatus, orderStatus,orderId.get());
+        newOrderDao.updateOrderStatus(orderDeliverStatus, orderStatus, orderId.get());
         return true;
     }
+
+    public void addReceiptRecord(Double amount, Integer status, Integer orderId) {
+        ReceiptVo receiptVo = new ReceiptVo();
+        // 31 线下凭证
+        receiptVo.setPayType(31);
+        receiptVo.setPayWay(2);
+        receiptVo.setNewReceiptType(2);
+        receiptVo.setReceiptType(1);
+        receiptVo.setReceiptStatus(3);
+        receiptVo.setReceiptAmount(amount.toString());
+        receiptDao.insertOrderReceipt(receiptVo);
+        OrderRelationRecord record = new OrderRelationRecord();
+        record.setReceiptAmount(amount);
+        record.setRelationType(2);
+        record.setReceiptId(receiptVo.getId());
+        record.setOrderId(orderId);
+        receiptDao.insertOrderRelation(record);
+        // 修改cm_order状态
+        newOrderDao.updateReceiptStatus(status, orderId);
+    }
 }

src/main/java/com/caimei/modules/products/entity/Sku.java

@@ -12,6 +12,7 @@ import java.util.List;
 @Data
 public class Sku {
 
+    private Integer id;
     private Integer productId;
 
     /**

src/main/java/com/caimei/utils/ImageUploadUtils.java

@@ -139,9 +139,10 @@ public class ImageUploadUtils {
     public JsonModel testImageUpload() throws Exception {
         JsonModel jsonModel = JsonModel.newInstance();
         try {
+            //获取base64文件编码
             String imgStr = GetImageStr();
-            imgStr = GetImageStr();//获取base64文件编码
-            String filepath = GenerateImage(imgStr,"jpg");//解析编码
+            //解析编码
+            String filepath = GenerateImage(imgStr,"jpg");
             String result = client.uploadFile(filepath);
             if (!StringUtils.isEmpty(result)) {
                 result = imageDomain + "/" + result;
@@ -204,7 +205,7 @@ public class ImageUploadUtils {
             //生成jpeg图片
 //            String path = ClassUtils.getDefaultClassLoader().getResource("").getPath();
             String file = new Random().nextInt(99999999) + imgStrType;
-            String filePath = "/mnt/newdatadrive/data/runtime/jar-instance/mall-admin/tempImage/" + file;
+            String filePath = "/mnt/newdatadrive/data/runtime/jar-instance/mall/tempImage/" + file;
             logger.info("1--------------filePath：" + filePath);
             //新生成的图片
             OutputStream out = new FileOutputStream(filePath);

src/main/resources/config/beta/application-beta.yml

@@ -49,7 +49,7 @@ pagehelper:
 
 #日志配置
 logging:
-  file: /mnt/newdatadrive/data/runtime/jar-instance/mall-admin/logs
+  file: /mnt/newdatadrive/data/runtime/jar-instance/mall/logs
   level: debug
 
 #自定义配置

src/main/resources/config/prod/application-prod.yml

@@ -49,7 +49,7 @@ pagehelper:
 
 #日志配置
 logging:
-  file: /mnt/newdatadrive/data/runtime/jar-instance/mall-admin/logs
+  file: /mnt/newdatadrive/data/runtime/jar-instance/mall/logs
   level: info
 
 #自定义配置

src/main/resources/mapper/CmDiscernReceiptMapper.xml

@@ -4,6 +4,26 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.modules.order.dao.CmDiscernReceiptDao">
 
+    <insert id="insertOrderReceipt" keyColumn="id" keyProperty="id"
+            parameterType="com.caimei.modules.order.entity.ReceiptVo" useGeneratedKeys="true">
+        insert into cm_discern_receipt(payWay, payType, receiptType, receiptStatus, receiptAmount, confirmType,
+                                       receiptDate, confirmDate, reviewDate, delFlag, receStatct)
+        values (#{payWay}, #{payType}, #{receiptType}, #{receiptStatus}, #{receiptAmount}, 4, now(), now(), now(), 0, 0)
+    </insert>
+
+    <insert id="insertOrderRelation">
+        INSERT INTO cm_receipt_order_relation(relationType,
+                                              receiptID,
+                                              associateAmount,
+                                              orderID,
+                                              delFlag)
+        VALUES (#{relationType},
+                #{receiptId},
+                #{receiptAmount},
+                #{orderId},
+                0)
+    </insert>
+
     <select id="findRebateOrderId" resultType="integer">
         select cso.orderId AS orderId
         from cm_receipt_order_relation cror left join cm_shop_order cso
@@ -164,7 +184,7 @@
         select type as id, bankAccount as name
         from cm_offline_collection
         where type in (12, 13, 14, 15, 17, 29, 30)
-        or organizeId = 4
+           or organizeId = 4
     </select>
 
     <select id="findOrderIds" resultType="java.lang.String">
@@ -178,7 +198,7 @@
     <select id="hasReceiptRecordOrder" resultType="java.lang.String">
         select cror.receiptId
         from cm_receipt_order_relation cror
-        left join cm_discern_receipt cdr on cror.receiptID = cdr.id
+                 left join cm_discern_receipt cdr on cror.receiptID = cdr.id
         where cror.orderID = #{orderID}
           and cror.receiptID != #{receiptID}
           and cror.relationType = '2'

src/main/resources/mapper/CmMallOrganizeProductsMapper.xml

@@ -135,7 +135,8 @@
     </select>
 
     <select id="findSkus" resultType="com.caimei.modules.products.entity.Sku">
-        select cs.productId,
+        select cmps.id,
+               cs.productId,
                cs.skuId,
                costProportional,
                costCheckFlag,
@@ -144,7 +145,7 @@
                cmps.price,
                cs.unit
         from cm_mall_product_sku cmps
-                 left join cm_sku cs on cmps.skuId = cs.skuId
+        left join cm_sku cs on cmps.skuId = cs.skuId
         where cmps.mallProductId = #{productId}
         order by cmps.price asc
     </select>
@@ -171,6 +172,6 @@
         update cm_mall_product_sku
         set minBuyNumber = #{minBuyNumber},
             price        = #{price}
-        where skuId = #{skuId}
+        where id = #{id}
     </update>
 </mapper>

src/main/resources/mapper/LogisticsBatchMapper.xml

@@ -53,4 +53,11 @@
         </where>
         order by a.deliveryTime desc
     </select>
+    <select id="findCompany" resultType="com.caimei.modules.order.entity.CompanyVo">
+        SELECT id, value, label
+        FROM sys_dict	WHERE `type`='kd_type'
+        <if test="value != null and value != ''">
+            AND value = #{value}
+        </if>
+    </select>
 </mapper>

src/main/resources/mapper/NewOrderMapper.xml

@@ -243,7 +243,13 @@
     <update id="updateOrderStatus">
         update cm_order
         set sendOutStatus = #{orderDeliverStatus},
-            status = #{orderStatus}
+            status        = #{orderStatus}
+        where orderId = #{orderId}
+    </update>
+
+    <update id="updateReceiptStatus">
+        update cm_order
+        set receiptStatus = #{status}
         where orderId = #{orderId}
     </update>
 
@@ -667,4 +673,21 @@
         from cm_order
         where orderId = (select orderId from cm_order_product where orderProductId = #{orderProductId})
     </select>
+
+    <select id="findOutLinePay" resultType="java.lang.Integer">
+        SELECT COUNT(receiptId)
+        FROM cm_receipt_order_relation cror
+        LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
+        WHERE cror.orderid = #{orderId}
+          AND cdr.payway = 2
+          AND cdr.delFlag = 0
+          AND cror.delFlag = 0
+    </select>
+
+    <select id="findNotes" resultType="java.lang.String">
+        select note
+        from cm_shop_order
+        where orderId = #{orderId}
+            and note is not null
+    </select>
 </mapper>

src/main/resources/mapper/NewOrderProductMapper.xml

@@ -118,6 +118,7 @@
 	<select id="findListByOrderId" resultType="com.caimei.modules.order.entity.NewOrderProduct">
 		SELECT
 		<include refid="orderProductColumns"/>
+		,(SELECT ifnull(SUM(num),0)FROM cm_logistics_record WHERE orderproductId=a.orderproductId) as sendOutNum
 		FROM cm_order_product a
 		<include refid="orderProductJoins"/>
 		WHERE a.orderId = #{orderId}
@@ -125,7 +126,7 @@
 	</select>
 
 	<select id="getActualCancelNum" resultType="java.lang.Integer">
-		select SUM(crpp.actualCancelNum)
+		select ifnull(SUM(crpp.actualCancelNum),0)
 		from cm_returned_purchase_product crpp
 				 left join cm_returned_purchase rp on rp.id = crpp.returnedID
 		where crpp.orderProductID = #{orderProductID}

src/main/resources/mapper/NewShopOrderMapper.xml

@@ -354,16 +354,16 @@
             <if test="shopOrderNo != null and shopOrderNo != ''">
                 AND a.shopOrderNo like concat('%', #{shopOrderNo} ,'%')
             </if>
-            <if test="listType == 3">
+            <if test="listType == 2">
                 AND cdr.payWay = 1
                 AND cdr.receiptDate <![CDATA[ <= ]]> NOW()
                 AND cror.relationType = 2
                 AND cror.delFlag = 0
                 AND cror.mbOrderId IS NOT NULL
                 AND cror.splitStatus = 0
-                AND a.receiptStatus=3
+                AND a.receiptStatus = 3
             </if>
-            <if test="listType == 2">
+            <if test="listType == 3">
                 AND co.refundType != 2
                 AND co.receiptStatus = 3
                 AND cdr.payWay = 1