Merge remote-tracking branch 'origin/developerC' into developerC

# Conflicts:
#	src/main/resources/mappings/modules/product/ProductMapper.xml
#	src/main/resources/mappings/modules/product/ProductNewMapper.xml

src/main/java/com/caimei/modules/bulkpurchase/dao/CmRefundsProductDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.CmRefundsProduct;
-
-/**
- * 退款信息列表DAO接口
- * @author sq
- * @version 2017-11-24
- */
-@MyBatisDao
-public interface CmRefundsProductDao extends CrudDao<CmRefundsProduct> {
-	
-}

src/main/java/com/caimei/modules/bulkpurchase/service/CmRefundsProductService.java

@@ -1,44 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.bulkpurchase.entity.CmRefundsProduct;
-import com.caimei.modules.bulkpurchase.dao.CmRefundsProductDao;
-
-/**
- * 退款信息列表Service
- * @author sq
- * @version 2017-11-24
- */
-@Service
-@Transactional(readOnly = true)
-public class CmRefundsProductService extends CrudService<CmRefundsProductDao, CmRefundsProduct> {
-
-	public CmRefundsProduct get(String id) {
-		return super.get(id);
-	}
-	
-	public List<CmRefundsProduct> findList(CmRefundsProduct cmRefundsProduct) {
-		return super.findList(cmRefundsProduct);
-	}
-	
-	public Page<CmRefundsProduct> findPage(Page<CmRefundsProduct> page, CmRefundsProduct cmRefundsProduct) {
-		return super.findPage(page, cmRefundsProduct);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CmRefundsProduct cmRefundsProduct) {
-		super.save(cmRefundsProduct);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CmRefundsProduct cmRefundsProduct) {
-		super.delete(cmRefundsProduct);
-	}
-	
-}

src/main/java/com/caimei/modules/bulkpurchase/web/CmRefundsProductController.java

@@ -3,7 +3,6 @@ package com.caimei.modules.bulkpurchase.web;
 import com.caimei.modules.bulkpurchase.entity.BpClause;
 import com.caimei.modules.bulkpurchase.entity.CmRefundsProduct;
 import com.caimei.modules.bulkpurchase.service.BpClauseService;
-import com.caimei.modules.bulkpurchase.service.CmRefundsProductService;
 import com.caimei.modules.order.dao.CmDiscernReceiptDao;
 import com.caimei.modules.order.dao.CmReturnedPurchaseDao;
 import com.caimei.modules.order.dao.NewOrderProductDao;
@@ -16,20 +15,15 @@ import com.caimei.modules.user.dao.CmUserDao;
 import com.caimei.modules.user.entity.CmUser;
 import com.caimei.utils.MathUtil;
 import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
 import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.annotation.Resource;
@@ -50,8 +44,6 @@ import java.util.stream.Collectors;
 @RequestMapping(value = "${adminPath}/bulkpurchase/cmRefundsProduct")
 public class CmRefundsProductController extends BaseController {
 
-    @Resource
-    private CmRefundsProductService cmRefundsProductService;
     @Resource
     private CmReturnedPurchaseDao cmReturnedPurchaseDao;
     @Resource
@@ -79,26 +71,6 @@ public class CmRefundsProductController extends BaseController {
     @Resource
     private ProductDao productDao;
 
-    @ModelAttribute
-    public CmRefundsProduct get(@RequestParam(required = false) String id) {
-        CmRefundsProduct entity = null;
-        if (StringUtils.isNotBlank(id)) {
-            entity = cmRefundsProductService.get(id);
-        }
-        if (entity == null) {
-            entity = new CmRefundsProduct();
-        }
-        return entity;
-    }
-
-    @RequiresPermissions("bulkpurchase:cmRefundsProduct:view")
-    @RequestMapping(value = {"list", ""})
-    public String list(CmRefundsProduct cmRefundsProduct, HttpServletRequest request, HttpServletResponse response, Model model) {
-        Page<CmRefundsProduct> page = cmRefundsProductService.findPage(new Page<CmRefundsProduct>(request, response), cmRefundsProduct);
-        model.addAttribute("page", page);
-        return "modules/bulkpurchase/cmRefundsProductList";
-    }
-
     @RequiresPermissions("bulkpurchase:cmRefundsProduct:view")
     @RequestMapping(value = "form")
     public String form(CmRefundsProduct cmRefundsProduct, Model model) {
@@ -106,45 +78,6 @@ public class CmRefundsProductController extends BaseController {
         return "modules/bulkpurchase/cmRefundsProductForm";
     }
 
-    @RequiresPermissions("bulkpurchase:cmRefundsProduct:edit")
-    @RequestMapping(value = "save")
-    public String save(CmRefundsProduct cmRefundsProduct, Model model, RedirectAttributes redirectAttributes) {
-        if (!beanValidator(model, cmRefundsProduct)) {
-            return form(cmRefundsProduct, model);
-        }
-        cmRefundsProductService.save(cmRefundsProduct);
-        addMessage(redirectAttributes, "保存退款信息列表成功");
-        return "redirect:" + Global.getAdminPath() + "/bulkpurchase/cmRefundsProduct/?repage";
-    }
-
-    @RequiresPermissions("bulkpurchase:cmRefundsProduct:delete")
-    @RequestMapping(value = "delete")
-    public String delete(CmRefundsProduct cmRefundsProduct, RedirectAttributes redirectAttributes) {
-        cmRefundsProductService.delete(cmRefundsProduct);
-        addMessage(redirectAttributes, "删除保存退款信息列表成功成功");
-        return "redirect:" + Global.getAdminPath() + "/bulkpurchase/cmRefundsProduct/?repage";
-    }
-
-
-    /**
-     * 查询退货退款商品
-     *
-     * @param cmRefundsProduct
-     * @param request
-     * @param response
-     * @param model
-     * @return
-     */
-    @RequestMapping(value = "selectlist")
-    public String selectlist(CmRefundsProduct cmRefundsProduct, HttpServletRequest request, HttpServletResponse response, Model model) {
-        Page<CmRefundsProduct> page = cmRefundsProductService.findPage(new Page<CmRefundsProduct>(request, response), cmRefundsProduct);
-        model.addAttribute("page", page);
-        String id = request.getParameter("orderId");
-        List<CmRefundsProduct> cmRefundsProductList = cmRefundsProductService.findList(cmRefundsProduct);
-        model.addAttribute("cmRefundsProductList", cmRefundsProductList);
-        return "modules/bulkpurchase/cmRefundsProductList";
-    }
-
     /**
      * @return
      * @Author ye.qin

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

@@ -201,8 +201,6 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
 
     List<OrderReceiptRelationPo> getUndividedPaidReceipt(@Param("currentTime")String currentTime,@Param("shopOrderIds")String shopOrderIds);
 
-    List<OrderReceiptRelationPo> getOnlineBalance(String currentTime);
-
     List<OrderProductVo> getOrderProductByOrderId(Integer orderId);
 
     Double getOrderProductPaidAmount(Integer orderProductId);

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

@@ -1,6 +1,8 @@
 package com.caimei.modules.order.entity;
 
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -10,6 +12,7 @@ import java.math.BigDecimal;
  * @author : Charles
  * @date : 2021/7/21
  */
+@Data
 public class OrderProductVo implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
@@ -60,6 +63,14 @@ public class OrderProductVo implements Serializable {
      * 比例成本百分比
      */
     private Double shopPercent;
+    /**
+     * 分采美佣金比例
+     */
+    private Double cmPercent;
+    /**
+     * 分组织佣金比例
+     */
+    private Double organizePercent;
     /**
      * 启用阶梯价标志 0否 1是
      */
@@ -180,10 +191,6 @@ public class OrderProductVo implements Serializable {
      * 商品类型(0正常商品,1协商赠品,2促销赠品)
      */
     private Integer productType;
-//    /**
-//     * 阶梯价列表(临时用，保存订单阶梯价格)
-//     */
-//    private List<LadderPriceVo> ladderPrices;
     /**
      * 订单号(保存订单用)
      */
@@ -247,463 +254,4 @@ public class OrderProductVo implements Serializable {
      */
     private String svipPriceTag;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getSplitCode() {
-        return splitCode;
-    }
-
-    public void setSplitCode(String splitCode) {
-        this.splitCode = splitCode;
-    }
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public Integer getShopId() {
-        return shopId;
-    }
-
-    public void setShopId(Integer shopId) {
-        this.shopId = shopId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getImage() {
-        return image;
-    }
-
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public String getShopName() {
-        return shopName;
-    }
-
-    public void setShopName(String shopName) {
-        this.shopName = shopName;
-    }
-
-    public Integer getProductCategory() {
-        return productCategory;
-    }
-
-    public void setProductCategory(Integer productCategory) {
-        this.productCategory = productCategory;
-    }
-
-    public Integer getCostCheckFlag() {
-        return costCheckFlag;
-    }
-
-    public void setCostCheckFlag(Integer costCheckFlag) {
-        this.costCheckFlag = costCheckFlag;
-    }
-
-    public Double getCostPrice() {
-        return costPrice;
-    }
-
-    public void setCostPrice(Double costPrice) {
-        this.costPrice = costPrice;
-    }
-
-    public Double getNormalPrice() {
-        return normalPrice;
-    }
-
-    public void setNormalPrice(Double normalPrice) {
-        this.normalPrice = normalPrice;
-    }
-
-    public Double getShopPercent() {
-        return shopPercent;
-    }
-
-    public void setShopPercent(Double shopPercent) {
-        this.shopPercent = shopPercent;
-    }
-
-    public Integer getLadderPriceFlag() {
-        return ladderPriceFlag;
-    }
-
-    public void setLadderPriceFlag(Integer ladderPriceFlag) {
-        this.ladderPriceFlag = ladderPriceFlag;
-    }
-
-    public Double getDiscountPrice() {
-        return discountPrice;
-    }
-
-    public void setDiscountPrice(Double discountPrice) {
-        this.discountPrice = discountPrice;
-    }
-
-    public Double getDiscount() {
-        return discount;
-    }
-
-    public void setDiscount(Double discount) {
-        this.discount = discount;
-    }
-
-    public Double getTotalAmount() {
-        return totalAmount;
-    }
-
-    public void setTotalAmount(Double totalAmount) {
-        this.totalAmount = totalAmount;
-    }
-
-    public Double getTotalFee() {
-        return totalFee;
-    }
-
-    public void setTotalFee(Double totalFee) {
-        this.totalFee = totalFee;
-    }
-
-    public Double getShouldPayFee() {
-        return shouldPayFee;
-    }
-
-    public void setShouldPayFee(Double shouldPayFee) {
-        this.shouldPayFee = shouldPayFee;
-    }
-
-    public String getProductUnit() {
-        return productUnit;
-    }
-
-    public void setProductUnit(String productUnit) {
-        this.productUnit = productUnit;
-    }
-
-    public Integer getNum() {
-        return num;
-    }
-
-    public void setNum(Integer num) {
-        this.num = num;
-    }
-
-    public Integer getPresentNum() {
-        return presentNum;
-    }
-
-    public void setPresentNum(Integer presentNum) {
-        this.presentNum = presentNum;
-    }
-
-    public Double getDiscountFee() {
-        return discountFee;
-    }
-
-    public void setDiscountFee(Double discountFee) {
-        this.discountFee = discountFee;
-    }
-
-    public Integer getIncludedTax() {
-        return includedTax;
-    }
-
-    public void setIncludedTax(Integer includedTax) {
-        this.includedTax = includedTax;
-    }
-
-    public Integer getInvoiceType() {
-        return invoiceType;
-    }
-
-    public void setInvoiceType(Integer invoiceType) {
-        this.invoiceType = invoiceType;
-    }
-
-    public Double getTaxRate() {
-        return taxRate;
-    }
-
-    public void setTaxRate(Double taxRate) {
-        this.taxRate = taxRate;
-    }
-
-    public Double getAddedValueTax() {
-        return addedValueTax;
-    }
-
-    public void setAddedValueTax(Double addedValueTax) {
-        this.addedValueTax = addedValueTax;
-    }
-
-    public Double getTotalAddedValueTax() {
-        return totalAddedValueTax;
-    }
-
-    public void setTotalAddedValueTax(Double totalAddedValueTax) {
-        this.totalAddedValueTax = totalAddedValueTax;
-    }
-
-    public Double getShopTaxRate() {
-        return shopTaxRate;
-    }
-
-    public void setShopTaxRate(Double shopTaxRate) {
-        this.shopTaxRate = shopTaxRate;
-    }
-
-    public Double getSingleShouldPayTotalTax() {
-        return singleShouldPayTotalTax;
-    }
-
-    public void setSingleShouldPayTotalTax(Double singleShouldPayTotalTax) {
-        this.singleShouldPayTotalTax = singleShouldPayTotalTax;
-    }
-
-    public Double getShouldPayTotalTax() {
-        return shouldPayTotalTax;
-    }
-
-    public void setShouldPayTotalTax(Double shouldPayTotalTax) {
-        this.shouldPayTotalTax = shouldPayTotalTax;
-    }
-
-    public Double getShopProductAmount() {
-        return shopProductAmount;
-    }
-
-    public void setShopProductAmount(Double shopProductAmount) {
-        this.shopProductAmount = shopProductAmount;
-    }
-
-    public Double getSingleShopFee() {
-        return singleShopFee;
-    }
-
-    public void setSingleShopFee(Double singleShopFee) {
-        this.singleShopFee = singleShopFee;
-    }
-
-    public Double getShopFee() {
-        return shopFee;
-    }
-
-    public void setShopFee(Double shopFee) {
-        this.shopFee = shopFee;
-    }
-
-    public Double getSingleOtherFee() {
-        return singleOtherFee;
-    }
-
-    public void setSingleOtherFee(Double singleOtherFee) {
-        this.singleOtherFee = singleOtherFee;
-    }
-
-    public Double getOtherFee() {
-        return otherFee;
-    }
-
-    public void setOtherFee(Double otherFee) {
-        this.otherFee = otherFee;
-    }
-
-    public Double getSingleCmFee() {
-        return singleCmFee;
-    }
-
-    public void setSingleCmFee(Double singleCmFee) {
-        this.singleCmFee = singleCmFee;
-    }
-
-    public Double getCmFee() {
-        return cmFee;
-    }
-
-    public void setCmFee(Double cmFee) {
-        this.cmFee = cmFee;
-    }
-
-    public Integer getPayStatus() {
-        return payStatus;
-    }
-
-    public void setPayStatus(Integer payStatus) {
-        this.payStatus = payStatus;
-    }
-
-    public Integer getBuyAgainFlag() {
-        return buyAgainFlag;
-    }
-
-    public void setBuyAgainFlag(Integer buyAgainFlag) {
-        this.buyAgainFlag = buyAgainFlag;
-    }
-
-    public Integer getNotOutStore() {
-        return notOutStore;
-    }
-
-    public void setNotOutStore(Integer notOutStore) {
-        this.notOutStore = notOutStore;
-    }
-
-    public Integer getActProduct() {
-        return actProduct;
-    }
-
-    public void setActProduct(Integer actProduct) {
-        this.actProduct = actProduct;
-    }
-
-    public Integer getProductType() {
-        return productType;
-    }
-
-    public void setProductType(Integer productType) {
-        this.productType = productType;
-    }
-
-    public Integer getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Integer orderId) {
-        this.orderId = orderId;
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public Integer getShopOrderId() {
-        return shopOrderId;
-    }
-
-    public void setShopOrderId(Integer shopOrderId) {
-        this.shopOrderId = shopOrderId;
-    }
-
-    public String getShopOrderNo() {
-        return shopOrderNo;
-    }
-
-    public void setShopOrderNo(String shopOrderNo) {
-        this.shopOrderNo = shopOrderNo;
-    }
-
-    public Integer getOrderProductId() {
-        return orderProductId;
-    }
-
-    public void setOrderProductId(Integer orderProductId) {
-        this.orderProductId = orderProductId;
-    }
-
-    public Integer getOrderPromotionsId() {
-        return orderPromotionsId;
-    }
-
-    public void setOrderPromotionsId(Integer orderPromotionsId) {
-        this.orderPromotionsId = orderPromotionsId;
-    }
-
-    public PromotionsVo getProductPromotion() {
-        return productPromotion;
-    }
-
-    public void setProductPromotion(PromotionsVo productPromotion) {
-        this.productPromotion = productPromotion;
-    }
-
-    public Integer getShipmentsNum() {
-        return shipmentsNum;
-    }
-
-    public void setShipmentsNum(Integer shipmentsNum) {
-        this.shipmentsNum = shipmentsNum;
-    }
-
-    public Integer getReturnedNum() {
-        return returnedNum;
-    }
-
-    public void setReturnedNum(Integer returnedNum) {
-        this.returnedNum = returnedNum;
-    }
-
-    public Integer getActualCancelNum() {
-        return actualCancelNum;
-    }
-
-    public void setActualCancelNum(Integer actualCancelNum) {
-        this.actualCancelNum = actualCancelNum;
-    }
-
-    public Integer getIncludedTaxFlag() {
-        return includedTaxFlag;
-    }
-
-    public void setIncludedTaxFlag(Integer includedTaxFlag) {
-        this.includedTaxFlag = includedTaxFlag;
-    }
-
-    public Integer getSvipPriceFlag() {
-        return svipPriceFlag;
-    }
-
-    public void setSvipPriceFlag(Integer svipPriceFlag) {
-        this.svipPriceFlag = svipPriceFlag;
-    }
-
-    public Integer getSvipPriceType() {
-        return svipPriceType;
-    }
-
-    public void setSvipPriceType(Integer svipPriceType) {
-        this.svipPriceType = svipPriceType;
-    }
-
-    public Double getSvipDiscount() {
-        return svipDiscount;
-    }
-
-    public void setSvipDiscount(Double svipDiscount) {
-        this.svipDiscount = svipDiscount;
-    }
-
-    public String getSvipPriceTag() {
-        return svipPriceTag;
-    }
-
-    public void setSvipPriceTag(String svipPriceTag) {
-        this.svipPriceTag = svipPriceTag;
-    }
 }

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

@@ -104,15 +104,23 @@ public class SplitAccountService extends BaseService {
                      *   自己成本部分不需要加入分账参数,仅需在else中做业务表参数处理
                      */
                     if (!key.equals(shopOrder.getSplitCode())) {
-                        //佣金
+                        // 佣金
                         AccountPayOrder.AccountPayOrderExt.SplitBillRule splitBillRule = new AccountPayOrder.AccountPayOrderExt.SplitBillRule();
-                        splitBillRule.setSplitBillAmount(value);
+                        // 分账计算的时候未处理手续费，总额处理手续费   x + x * 0.1% = value
+                        BigDecimal div = MathUtil.div(value, 1.001, 2);
+                        if (MathUtil.sub(value, div).doubleValue() < 0.01) {
+                            // 如果手续费小于最低手续费，取0.01
+                            div = MathUtil.round(MathUtil.sub(value, 0.01), 2);
+                        }
+                        splitBillRule.setSplitBillAmount(div);
                         splitBillRule.setSplitBillMerchantNo(key);
                         splitBillRules.add(splitBillRule);
                     } else {
-                        // 成本分账处理
-                        // 子订单的splitcode和分账对象的splitcode一样的是留在账户里的钱，实际在付款完成后，付款状态就为已付款，分账状态就为已分账
-                        // 为维持业务完整性，保持原来的分账流程不变
+                        /**
+                         *  成本分账处理
+                         *  子订单的splitcode和分账对象的splitcode一样的是留在账户里的钱，实际在付款完成后，付款状态就为已付款，分账状态就为已分账
+                         *  为维持业务完整性，保持原来的分账流程不变
+                         */
                         List<SplitAccountPo> splitAccountList = newOrderDao.getSplitAccountList(orderRelation.getMbOrderId());
                         if (splitAccountList != null && splitAccountList.size() > 0) {
                             Integer orderId = splitAccountList.get(0).getOrderId();
@@ -311,19 +319,12 @@ public class SplitAccountService extends BaseService {
         List<OrderProductVo> orderProductList = newOrderDao.getOrderProductByShopOrderId(shopOrder.getShopOrderId());
 
         for (OrderProductVo orderProduct : orderProductList) {
-            //成本价*数量
-            double costPrice = MathUtil.mul(orderProduct.getCostPrice(), orderProduct.getNum()).doubleValue();
+            // 价格 * 数量 * 供应商成本比例/100
+            double costPrice = MathUtil.mul(orderProduct.getTotalAmount(), orderProduct.getShopPercent() / 100, 2).doubleValue();
             if (2 == supportFlag) {
                 //供应商自己承担手续费
                 costPrice = MathUtil.sub(costPrice, procedureFee).doubleValue();
             }
-            // 不含税能开发票
-            if (Integer.valueOf(0).equals(orderProduct.getIncludedTax()) && !Integer.valueOf(3).equals(orderProduct.getInvoiceType())) {
-                //应付总税费
-                Double payableTax = MathUtil.mul(orderProduct.getSingleShouldPayTotalTax(), orderProduct.getNum()).doubleValue();
-                //成本+税费
-                costPrice = MathUtil.add(costPrice, payableTax).doubleValue();
-            }
             /**
              * todo
              * 出于兼容性考虑，且多次支付手续费不同，分账方式为循环每次支付记录，
@@ -363,38 +364,9 @@ public class SplitAccountService extends BaseService {
                 break;
             }
         }
-        // 还有钱就付供应商运费
-        // 付供应商运费,是以供应商为单位的
-        if (MathUtil.compare(splitAmount, 0) > 0) {
-            // 运费
-            Double shopPostFee = shopOrder.getShopPostFee();
-            if (MathUtil.compare(shopPostFee, 0) > 0) {
-                // 查询已支付运费
-                Double shipping = newOrderDao.getPaidShipping(shopOrder.getOrderId(), shopOrder.getShopId());
-                shopPostFee = MathUtil.sub(shopPostFee, shipping).doubleValue();
-                if (MathUtil.compare(splitAmount, shopPostFee) > -1) {
-                    splitAmount = MathUtil.sub(splitAmount, shopPostFee).doubleValue();
-                } else {
-                    shopPostFee = splitAmount;
-                    splitAmount = 0.00;
-                }
-                SplitAccountPo splitAccount = new SplitAccountPo();
-                splitAccount.setOrderId(shopOrder.getOrderId());
-                splitAccount.setShopId(shopOrder.getShopId());
-                splitAccount.setSplitAccount(shopPostFee);
-                splitAccount.setProductType(2);
-                //供应商拥有子商户号
-                splitAccount.setType(4);
-                splitAccount.setSubUserNo(shopOrder.getSplitCode());
-                logger.info("付供应商运费分账参数------------->" + splitAccount);
-                list.add(splitAccount);
-            }
-        }
-        // 如果还有钱则为佣金,分到信息
+        // 如果还有钱则为佣金,分到网络
         if (MathUtil.compare(splitAmount, 0) > 0) {
-            //分账手续费0.1%采美承担,佣金扣除0.1%
-            Double amount = Math.max(MathUtil.mul(splitAmount, 0.001, 2).doubleValue(), 0.01);
-            splitAmount = MathUtil.sub(splitAmount, amount).doubleValue();
+            // 此处不考虑手续费，外部计算总额
             SplitAccountPo splitAccount = new SplitAccountPo();
             splitAccount.setOrderId(shopOrder.getOrderId());
             splitAccount.setShopOrderId(shopOrder.getShopOrderId());
@@ -472,237 +444,5 @@ public class SplitAccountService extends BaseService {
             throw new IllegalStateException("分账异常", e);
         }
     }
-}
-
-//    //正式
-////    public static final String callUrl = "https://core.caimei365.com/order/pay/delay/split/callback";
-//    //测试
-//    public static final String callUrl = "https://core-b.caimei365.com/order/pay/delay/split/callback";
-
-//    @Transactional(readOnly = false)
-//    public void SplitAccount() {
-//        logger.info("【手动分账开始】>>>>>>>>>>手动分账");
-//        Calendar calendar = Calendar.getInstance();
-//        calendar.setTime(new Date());
-//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        String currentTime = format.format(calendar.getTime());
-//        // 查询未分账已支付收款
-//        List<OrderReceiptRelationPo> orderRelations = newOrderDao.getUndividedPaidReceipt(currentTime);
-//        if (null != orderRelations && orderRelations.size() > 0) {
-//            for (OrderReceiptRelationPo orderRelation : orderRelations) {
-//                logger.info("【手动分账】>>>>>>>>>>订单id:" + orderRelation.getOrderId() + ",进入手动分账");
-//                // 收款对应的订单信息
-//                OrderVo order = newOrderDao.getOrderByOrderId(orderRelation.getOrderId());
-//                PayParamBo payParam = new PayParamBo();
-//                payParam.setPayAmount(MathUtil.mul(orderRelation.getAssociateAmount(), 100).intValue());
-//                if (12 == orderRelation.getPayType()) {
-//                    // 网银支付
-//                    payParam.setPayWay("UNIONPAY");
-//                }
-//                if (20 == orderRelation.getPayType()) {
-//                    payParam.setPayWay("TRANSFER");
-//                }
-//                List<SplitAccountPo> splitBillDetail = setSplitAccountDetail(order, payParam);
-//                List<Map<String, String>> maps = new ArrayList<>();
-//                //供应商子商户金额
-//                for (SplitAccountPo account : splitBillDetail) {
-//                    if (null != account.getType() && 4 == account.getType()) {
-//                        //每个有供应商子商户的分账给对应供应商子商户
-//                        addMaps(maps, account.getSplitAccount(), account.getSubUserNo());
-//                    }
-//                }
-//                //公账-专票总金额,私账-无票总金额,公账-普票总金额
-//                //佣金进网络
-//                double totalAmount1 = 0.00;
-//                double totalAmount2 = 0.00;
-//                double totalAmount3 = 0.00;
-//                double totalAmount4 = 0.00;
-//                for (SplitAccountPo account : splitBillDetail) {
-//                    if (1 == account.getType()) {
-//                        totalAmount1 = MathUtil.add(totalAmount1, account.getSplitAccount()).doubleValue();
-//                    } else if (2 == account.getType()) {
-//                        totalAmount2 = MathUtil.add(totalAmount2, account.getSplitAccount()).doubleValue();
-//                    } else if (3 == account.getType()) {
-//                        totalAmount3 = MathUtil.add(totalAmount3, account.getSplitAccount()).doubleValue();
-//                    } else if (5 == account.getType()) {
-//                        totalAmount4 = MathUtil.add(totalAmount4, account.getSplitAccount()).doubleValue();
-//                    }
-//                }
-//                addMaps(maps, totalAmount1, PayUtil.publicAccountNo);
-//                addMaps(maps, totalAmount2, PayUtil.privateAccountNo);
-//                addMaps(maps, totalAmount3, PayUtil.commonInvoiceNo);
-//                // 网络
-//                addMaps(maps, totalAmount4, PayUtil.brokerage);
-////                addMaps(maps, totalAmount4, PayUtil.publicAccountNo);
-//                String parameters = JSON.toJSONString(maps);
-//                logger.info("【手动分账】>>>>>>>>>>分账参数: " + parameters);
-//
-//                //第三方分账接口
-//                JSONObject result = null;
-//                try {
-//                    // 时间戳
-//                    long time = System.currentTimeMillis() / 1000;
-//                    JSONObject json = new JSONObject();
-//                    json.put("merAccount", PayUtil.merAccount);
-//                    json.put("orderId", orderRelation.getOrderRequestNo());
-//                    json.put("requestNo", orderRelation.getOrderRequestNo());
-//                    json.put("mbOrderId", orderRelation.getMbOrderId());
-//                    json.put("time", time);
-//                    json.put("splitBillDetail", parameters);
-//                    json.put("notifyUrl", callUrl);
-//                    logger.info("回调接口>>>" + callUrl);
-//                    String sign = PayUtil.getPaySign(json, PayUtil.merKey);
-//                    json.put("sign", sign);
-//                    logger.info("发送参数json----->" + json);
-//                    String data = PayUtil.privateKeyEncrypt(json, PayUtil.merKey);
-//                    result = PayUtil.httpGet("https://platform.mhxxkj.com/paygateway/mbpay/splitOrder/v1", PayUtil.merAccount, data);
-//                } catch (Exception e) {
-//                    logger.error("【手动分账】>>>>>>>>>>错误信息", e);
-//                }
-//                if (result != null) {
-//                    String code = result.getString("code");
-//                    if (!"000000".equals(code)) {
-//                        String msg = result.getString("msg");
-//                        logger.info("【手动分账】>>>>>>>>>>第三方延迟分账失败>>>>>>>msg:" + msg);
-//                    } else {
-//                        for (SplitAccountPo splitAccount : splitBillDetail) {
-//                            splitAccount.setMbOrderId(orderRelation.getMbOrderId());
-//                            splitAccount.setOrderRequestNo(orderRelation.getOrderRequestNo());
-//                            splitAccount.setPayStatus(1);
-//                            // 保存分账详情
-//                            newOrderDao.insertSplitAccount(splitAccount);
-//                            redisService.remove("XSFZMDS");
-//                        }
-//                        logger.info("【手动分账】>>>>>>>>>>此订单分账结束");
-//                    }
-//                }
-//            }
-//        }
-//    }
-//
-//
-//    /**
-//     * 分账参数添加
-//     */
-//    private void addMaps(List<Map<String, String>> maps, Double shopTotalAmount, String subUserNo) {
-//        if (MathUtil.compare(shopTotalAmount, 0) > 0) {
-//            Map<String, String> map = new HashMap<>(3);
-//            map.put("subUserNo", subUserNo);
-//            map.put("splitBillType", "2");
-//            map.put("splitBillValue", MathUtil.mul(shopTotalAmount, 100).toString());
-//            maps.add(map);
-//        }
-//    }
-//
-//    /**
-//     * 分账详情
-//     */
-//    private List<SplitAccountPo> setSplitAccountDetail(OrderVo order, PayParamBo payParam) {
-//        List<SplitAccountPo> list = new ArrayList<>();
-//        // 本次支付金额,单位/元
-//        double payAmount = MathUtil.div(payParam.getPayAmount(), 100).doubleValue();
-//        // 待分账总金额
-//        double splitAmount = payAmount;
-//        // 总手续费
-//        double procedureFee;
-//        if ("UNIONPAY".equals(payParam.getPayWay())) {
-//            procedureFee = 8.00;
-//        } else {
-//            //手续费
-//            procedureFee = MathUtil.mul(payAmount, 0.0038, 2).doubleValue();
-//            if (MathUtil.compare(procedureFee, 0) == 0) {
-//                procedureFee = 0.01;
-//            }
-//        }
-//        splitAmount = MathUtil.sub(splitAmount, procedureFee).doubleValue();
-//        // 商品数据
-//        List<OrderProductVo> orderProductList = newOrderDao.getOrderProductByOrderId(order.getOrderId());
-//        for (OrderProductVo orderProduct : orderProductList) {
-//            double costPrice = MathUtil.mul(orderProduct.getCostPrice(), orderProduct.getNum()).doubleValue();
-//            // 不含税能开发票
-//            if (Integer.valueOf(0).equals(orderProduct.getIncludedTax()) && !Integer.valueOf(3).equals(orderProduct.getInvoiceType())) {
-//                //应付总税费
-//                Double payableTax = MathUtil.mul(orderProduct.getSingleShouldPayTotalTax(), orderProduct.getNum()).doubleValue();
-//                costPrice = MathUtil.add(costPrice, payableTax).doubleValue();
-//            }
-//            // 判断是否支付过
-//            Double paidAmount = newOrderDao.getOrderProductPaidAmount(orderProduct.getOrderProductId());
-//            //有已付
-//            if (null != paidAmount  && MathUtil.compare(paidAmount, 0) > 0) {
-//                //已付>0，成本-已付
-//                costPrice = MathUtil.sub(costPrice, paidAmount).doubleValue();
-//            }
-//            // 待分账金额>成本
-//            if (MathUtil.compare(splitAmount, costPrice) > 0) {
-//                // 待分账金额-成本
-//                splitAmount = MathUtil.sub(splitAmount, costPrice).doubleValue();
-//            } else {
-//                costPrice = splitAmount;
-//                splitAmount = 0.00;
-//            }
-//            if (costPrice > 0) {
-//                SplitAccountPo splitAccount = new SplitAccountPo();
-//                splitAccount.setOrderId(order.getOrderId());
-//                splitAccount.setOrderProductId(orderProduct.getOrderProductId());
-//                splitAccount.setShopId(orderProduct.getShopId());
-//                splitAccount.setSplitAccount(costPrice);
-//                splitAccount.setProductType(1);
-//                if (StringUtils.isNotBlank(orderProduct.getSplitCode())) {
-//                    // 该商品设置了商户号
-//                    splitAccount.setType(4);
-//                    splitAccount.setSubUserNo(orderProduct.getSplitCode());
-//                }
-//                logger.info("成本分账参数------------->" + splitAccount.toString());
-//                list.add(splitAccount);
-//            }
-//            if (MathUtil.compare(splitAmount, 0) == 0) {
-//                break;
-//            }
-//        }
-//        // 付供应商运费,是以供应商为单位的
-//        if (MathUtil.compare(splitAmount, 0) > 0) {
-//            List<ShopOrderVo> shopOrderList = newOrderDao.getShopOrderListByOrderId(order.getOrderId());
-//            for (ShopOrderVo shopOrder : shopOrderList) {
-//                // 运费
-//                Double shopPostFee = shopOrder.getShopPostFee();
-//                if (MathUtil.compare(shopPostFee, 0) > 0) {
-//                    // 查询已支付运费
-//                    Double shipping = newOrderDao.getPaidShipping(order.getOrderId(), shopOrder.getShopId());
-//                    shopPostFee = MathUtil.sub(shopPostFee, shipping).doubleValue();
-//                    if (MathUtil.compare(splitAmount, shopPostFee) > -1) {
-//                        splitAmount = MathUtil.sub(splitAmount, shopPostFee).doubleValue();
-//                    } else {
-//                        shopPostFee = splitAmount;
-//                        splitAmount = 0.00;
-//                    }
-//                    String commercialCode = newOrderDao.getShopCommercialCode(shopOrder.getShopId());
-//                    SplitAccountPo splitAccount = new SplitAccountPo();
-//                    splitAccount.setOrderId(order.getOrderId());
-//                    splitAccount.setShopId(shopOrder.getShopId());
-//                    splitAccount.setSplitAccount(shopPostFee);
-//                    splitAccount.setProductType(2);
-//                    if (StringUtils.isNotBlank(commercialCode)) {
-//                        //供应商拥有子商户号
-//                        splitAccount.setType(4);
-//                        splitAccount.setSubUserNo(commercialCode);
-//                    }
-//                    logger.info("付供应商运费分账参数------------->" + splitAccount);
-//                    list.add(splitAccount);
-//                }
-//            }
-//        }
-//        //佣金,公账
-//        if (MathUtil.compare(splitAmount, 0) > 0) {
-//            SplitAccountPo splitAccount = new SplitAccountPo();
-//            splitAccount.setOrderId(order.getOrderId());
-//            splitAccount.setSplitAccount(splitAmount);
-//            splitAccount.setProductType(3);
-//            splitAccount.setType(5);
-//            //佣金进采美网络
-//            splitAccount.setSubUserNo(PayUtil.brokerage);
-//            logger.info("佣金分账参数------------->" + splitAccount);
-//            list.add(splitAccount);
-//        }
-//        return list;
-//    }
 
+}

src/main/java/com/caimei/modules/product/entity/CmShoporder.java

@@ -56,7 +56,6 @@ public class CmShoporder extends DataEntity<CmShoporder> {
 	private String returnGoodsStatus;		// returnGoodsStatus
 	private String deliveryTime;		// 发货时间
 	private String receiveGoodsTime;		// 收货时间
-	private String synToERPFlag;		// 是否推送到ERP：1是，空或0否
 	private Long deliveryTimeMills;		// 发货时间（时间戳）
 	private Long autoReviceGoodsDeadTimeMills;		// 订单由发货状态自动变更为已签收状态的时间（当前默认15天）
 	private Long autoFinishDeadTimeMills;		// 订单由已签收状态自动变更为已完成状态的时间（当前默认15天）
@@ -489,16 +488,7 @@ public class CmShoporder extends DataEntity<CmShoporder> {
 	public void setReceiveGoodsTime(String receiveGoodsTime) {
 		this.receiveGoodsTime = receiveGoodsTime;
 	}
-	
-	@Length(min=0, max=1, message="是否推送到ERP：1是，空或0否长度必须介于 0 和 1 之间")
-	public String getSynToERPFlag() {
-		return synToERPFlag;
-	}
 
-	public void setSynToERPFlag(String synToERPFlag) {
-		this.synToERPFlag = synToERPFlag;
-	}
-	
 	public Long getDeliveryTimeMills() {
 		return deliveryTimeMills;
 	}

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -26,7 +26,6 @@ public class Product extends DataEntity<Product> {
     private Integer bigTypeID;//一级商品分类
     private Integer smallTypeID;//二级商品分类
     private Integer tinyTypeID;        // 三级分类Id
-    private Integer selfTypeID;        // selfTypeID
     private Integer shopID;        // 所属供应商Id
     private String searchKey;        // 搜索关键词
     private String productRemarks;//商品备注
@@ -42,19 +41,15 @@ public class Product extends DataEntity<Product> {
     private String addTime;        // 添加时间
     private String updateTime;        // 更新时间
     private String sellNumber;        // 销量
-    private String weekSellNumber;        // weekSellNumber
     private String beforeValidFlag;        // 保存商品状态修改之前的状态（目前只在进行冻结操作时保存）
     private String favoriteTimes;        // 收藏量
     private String commentScore;        // 评论分数
     private String commentTimes;        // 评论次数
-    private String selfRecommendFlag;        // selfRecommendFlag
-    private String sysRecommendFlag;        // sysRecommendFlag
     private String sortIndex;        // 排序值
     private String featuredFlag;        // 供应商主推商品标志 0否 1是
     private String featuredSortIndex;        // 供应商主推商品排序
     private String productCode;        // 商品货号
     private String unit;        // 包装规格
-    private String synToERPFlag;        // 是否推送到ERP，1已推送， 空或0未推送
     private String allAreaFlag;        // 销售区域：1全部区域， 0指定区域
     private String provinceIDs;        // 指定的销售区域
     private String serviceNumber;        // 服务起订量
@@ -63,9 +58,6 @@ public class Product extends DataEntity<Product> {
     private String packageCount;        // 最小包装数量
     private String byFlag;        // 运费：0买家承担， 1卖家承担
     private String normalProductFlag;        // 普通商品标志 1是
-    private String wholeSaleProductFlag;        // wholeSaleProductFlag
-    private String promotionProductFlag;        // promotionProductFlag
-    private String groupBuyProductFlag;        // groupBuyProductFlag
     private String step;        // 购买梯度数（编辑数量时加减的数量）
     private String actFlag;        // 是否活动商品：1是，空或0不是
     private String actType;        // '商品活动类型：1推荐热销、2推荐上新、3团购促销、4无',
@@ -717,14 +709,6 @@ public class Product extends DataEntity<Product> {
         this.tinyTypeID = tinyTypeID;
     }
 
-    public Integer getSelfTypeID() {
-        return selfTypeID;
-    }
-
-    public void setSelfTypeID(Integer selfTypeID) {
-        this.selfTypeID = selfTypeID;
-    }
-
     public Integer getShopID() {
         return shopID;
     }
@@ -814,14 +798,6 @@ public class Product extends DataEntity<Product> {
         this.sellNumber = sellNumber;
     }
 
-    public String getWeekSellNumber() {
-        return weekSellNumber;
-    }
-
-    public void setWeekSellNumber(String weekSellNumber) {
-        this.weekSellNumber = weekSellNumber;
-    }
-
     public String getBeforeValidFlag() {
         return beforeValidFlag;
     }
@@ -854,22 +830,6 @@ public class Product extends DataEntity<Product> {
         this.commentTimes = commentTimes;
     }
 
-    public String getSelfRecommendFlag() {
-        return selfRecommendFlag;
-    }
-
-    public void setSelfRecommendFlag(String selfRecommendFlag) {
-        this.selfRecommendFlag = selfRecommendFlag;
-    }
-
-    public String getSysRecommendFlag() {
-        return sysRecommendFlag;
-    }
-
-    public void setSysRecommendFlag(String sysRecommendFlag) {
-        this.sysRecommendFlag = sysRecommendFlag;
-    }
-
     public String getSortIndex() {
         return sortIndex;
     }
@@ -910,14 +870,6 @@ public class Product extends DataEntity<Product> {
         this.unit = unit;
     }
 
-    public String getSynToERPFlag() {
-        return synToERPFlag;
-    }
-
-    public void setSynToERPFlag(String synToERPFlag) {
-        this.synToERPFlag = synToERPFlag;
-    }
-
     public String getAllAreaFlag() {
         return allAreaFlag;
     }
@@ -982,30 +934,6 @@ public class Product extends DataEntity<Product> {
         this.normalProductFlag = normalProductFlag;
     }
 
-    public String getWholeSaleProductFlag() {
-        return wholeSaleProductFlag;
-    }
-
-    public void setWholeSaleProductFlag(String wholeSaleProductFlag) {
-        this.wholeSaleProductFlag = wholeSaleProductFlag;
-    }
-
-    public String getPromotionProductFlag() {
-        return promotionProductFlag;
-    }
-
-    public void setPromotionProductFlag(String promotionProductFlag) {
-        this.promotionProductFlag = promotionProductFlag;
-    }
-
-    public String getGroupBuyProductFlag() {
-        return groupBuyProductFlag;
-    }
-
-    public void setGroupBuyProductFlag(String groupBuyProductFlag) {
-        this.groupBuyProductFlag = groupBuyProductFlag;
-    }
-
     public String getStep() {
         return step;
     }

src/main/resources/mappings/modules/bulkpurchase/CmRefundsProductMapper.xml

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.modules.bulkpurchase.dao.CmRefundsProductDao">
-    
-	<sql id="cmRefundsProductColumns">
-		a.id AS "id",
-		a.orderId AS "orderId",
-		a.productId AS "productId",
-		a.orderType AS "orderType",
-		a.productName AS "productName",
-		a.productNum AS "productNum",
-		a.shopId AS  "shopId",
-		a.shopName AS  "shopName",
-		(SELECT mobile FROM bp_order_userinfo WHERE bp_order_userinfo.orderId = a.orderId ) AS "mobile"
-	</sql>
-	
-
-	<select id="get" resultType="CmRefundsProduct">
-		SELECT 
-			<include refid="cmRefundsProductColumns"/>
-		FROM cm_refunds_product a
-		WHERE a.id = #{id}
-	</select>
-	
-	<select id="findList" resultType="CmRefundsProduct">
-		SELECT 
-			<include refid="cmRefundsProductColumns"/>
-		FROM cm_refunds_product a
-		<where>
-			<if test="orderId != null and orderId != ''">
-				AND a.orderId = #{orderId}
-			</if>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-	
-	<select id="findAllList" resultType="CmRefundsProduct">
-		SELECT 
-			<include refid="cmRefundsProductColumns"/>
-		FROM cm_refunds_product a
-		<where>
-			
-		</where>		
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-	
-	<insert id="insert" parameterType="CmRefundsProduct"  keyProperty="id" useGeneratedKeys="true">
-		INSERT INTO cm_refunds_product(
-			id,
-			orderId,
-			productId,
-			orderType,
-			productName,
-			productNum
-		) VALUES (
-			#{id},
-			#{orderId},
-			#{productId},
-			#{orderType},
-			#{productName},
-			#{productNum}
-		)
-	</insert>
-	
-	<update id="update">
-		UPDATE cm_refunds_product SET 	
-			orderId = #{orderId},
-			productId = #{productId},
-			orderType = #{orderType},
-			productName = #{productName},
-			productNum = #{productNum}
-		WHERE id = #{id}
-	</update>
-	
-	<delete id="delete">
-		DELETE FROM cm_refunds_product
-		WHERE id = #{id}
-	</delete>
-	
-</mapper>

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -1071,38 +1071,10 @@
         AND cdr.receiptDate <![CDATA[  <=  ]]> #{currentTime}
         AND co.organizeID = 0
         AND co.orderType != 2
-        AND co.refundType != 2
+        AND cso.refundStatus = 1
         AND p.splitCode != 'E1807059160'
     </select>
 
-    <select id="getOnlineBalance" resultType="com.caimei.modules.order.entity.OrderReceiptRelationPo">
-        SELECT DISTINCT cror.id,
-                        cror.relationType,
-                        cror.receiptId,
-                        cror.associateAmount,
-                        cror.orderId,
-                        cror.delFlag,
-                        cror.mbOrderId,
-                        cror.orderRequestNo,
-                        cror.splitStatus,
-                        cdr.payType
-        FROM cm_receipt_order_relation cror
-                 LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
-                 LEFT JOIN cm_order co ON cror.orderID = co.orderID
-                 LEFT JOIN cm_user_balance_record cubr ON cubr.orderId = cror.orderID
-        WHERE cror.relationType = 2
-          AND cror.delFlag = 0
-          AND cror.splitStatus = 0
-          AND cdr.delFlag = 0
-          AND cdr.payWay = 3
-          AND cdr.receiptDate <![CDATA[  <=  ]]> #{currentTime}
-          AND co.organizeID = 0
-          AND co.orderType != 2
-          AND co.refundType != 2
-          AND cubr.balanceType = 10
-          AND cror.associateAmount > 0.01
-    </select>
-
     <select id="getOrderProductByOrderId" resultType="com.caimei.modules.order.entity.OrderProductVo">
         SELECT cop.orderProductID                                                 AS orderProductId,
                cop.orderID                                                        AS orderId,
@@ -1322,7 +1294,10 @@
                cop.isActProduct                                                   AS actProduct,
                cop.productType,
                p.productCategory                                                  as productCategory,
-               p.splitCode
+               p.splitCode,
+               cop.shopPercent,
+               cop.cmPercent,
+               cop.organizePercent
         FROM cm_order_product cop
                  LEFT JOIN product p ON cop.productID = p.productID
                  left join cm_order co on co.orderID = cop.orderID