联合丽格V1.0.2

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

@@ -652,7 +652,7 @@ public class CmRefundsProductController extends BaseController {
         try {
             NewOrder newOrder = newOrderService.get(cmReturnedPurchase.getOrderID().toString());
             //过滤子订单
-            List<NewShopOrder>  newShopOrders= newOrder.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderID() ==cmReturnedPurchase.getShopOrderID()).collect(Collectors.toList());
+            List<NewShopOrder>  newShopOrders= newOrder.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderID().equals(cmReturnedPurchase.getShopOrderID())).collect(Collectors.toList());
             newOrder.setNewShopOrders(newShopOrders);
             cmReturnedPurchase.setOrderType(Integer.valueOf(newOrder.getOrderType()));
             List<CmReturnedPurchase> dataList = cmReturnedPurchaseService.getReturnedPurchaseList(cmReturnedPurchase);
@@ -722,6 +722,11 @@ public class CmRefundsProductController extends BaseController {
     public String toRecturnRecord(CmReturnedPurchase cmReturnedPurchase, HttpServletRequest request, HttpServletResponse response, Model model) {
         try {
             NewOrder order = newOrderService.get(cmReturnedPurchase.getOrderID().toString());
+            //过滤子订单
+            List<NewShopOrder>  newShopOrders= order.getNewShopOrders().stream().filter(s ->
+                    s.getShopOrderID().equals(cmReturnedPurchase.getShopOrderID()) )
+                    .collect(Collectors.toList());
+            order.setNewShopOrders(newShopOrders);
             cmReturnedPurchase.setOrderType(Integer.valueOf(order.getOrderType()));
             List<CmReturnedPurchase> dataList = cmReturnedPurchaseService.getReturnedPurchaseList(cmReturnedPurchase);
             for (CmReturnedPurchase returnedPurchase : dataList) {
@@ -740,27 +745,7 @@ public class CmRefundsProductController extends BaseController {
                     refundFee += bean.getRefundFee();
                 }
             }
-            //联合丽格运费
-            String PostageInfo = null;
-            // 拼接运费信息--联合丽格
-            boolean isColdChina = order.getNewShopOrders().stream().map(NewShopOrder::getIsColdChina).collect(Collectors.toList()).contains(1);
-            Double ColdChina = Double.valueOf(700);
 
-            if (isColdChina) {
-                if ("-1" == order.getFreePostFlag()) {
-                    // 到付
-                    PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
-                } else if ("0" == order.getFreePostFlag()) {
-                    // 包邮
-                    PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
-                } else {
-                    // 有运费
-                    PostageInfo = "￥" + order.getFreight() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(order.getFreight(), ColdChina)+ ")";
-                }
-            } else {
-                PostageInfo = order.getFreePostFlag() == "-1" ? "到付" : order.getFreePostFlag() == "0" ? "包邮" : "￥" + order.getFreight();
-            }
-            model.addAttribute("postageInfo", PostageInfo);
             Integer lastReceiptDetailId = cmDiscernReceiptDao.findOrderLastReceiptDetailId(order.getOrderID().toString());
             model.addAttribute("lastReceiptDetailId", lastReceiptDetailId);
             model.addAttribute("bpClauses", bpClauses);
@@ -786,7 +771,7 @@ public class CmRefundsProductController extends BaseController {
         try {
             NewOrder newOrder = newOrderService.get(cmReturnedPurchase.getOrderID().toString());
 //            //过滤子订单
-//            List<NewShopOrder>  newShopOrders= newOrder.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderID() ==cmReturnedPurchase.getShopOrderID()).collect(Collectors.toList());
+//            List<NewShopOrder>  newShopOrders= newOrder.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderID().equals(cmReturnedPurchase.getShopOrderID())).collect(Collectors.toList());
 //            newOrder.setNewShopOrders(newShopOrders);
             cmReturnedPurchase.setOrderType(Integer.valueOf(newOrder.getOrderType()));
             List<CmReturnedPurchase> dataList = cmReturnedPurchaseService.getReturnedPurchaseList(cmReturnedPurchase);

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

@@ -15,6 +15,7 @@ import java.util.List;
  * @description 主订单表
  */
 public class NewOrder extends DataEntity<NewOrder> {
+
     private Integer orderSeen;            //订单对机构可见度，1可见，2不可见
     private Integer orderID;             // bigint(11) not null,
     private String orderNo;             // varchar(30) comment '订单编号',
@@ -22,6 +23,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     //采美组织: 默认为null,具体对应cm_mall_organize表ID
     private Integer organizeID;
     private Integer organizeStoreId;    // 组织门店id
+    private Integer shopOrderID;        // varchar(100) comment '子订单ID',
     private String shopOrderIDs;        // varchar(100) comment '子订单ID',
     private String orderSubmitType;     // char(2) comment '订单提交类型',
     private String status;      // char(2) comment '订单状态'
@@ -169,6 +171,13 @@ public class NewOrder extends DataEntity<NewOrder> {
      */
     private Integer receiveCouponId;
     private CmHeheCouponOrderRecord heheCouponRecord;   //优惠券信息
+    public Integer getShopOrderID() {
+        return shopOrderID;
+    }
+
+    public void setShopOrderID(Integer shopOrderID) {
+        this.shopOrderID = shopOrderID;
+    }
 
     public Integer getSplitCount() {
         return splitCount;

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

@@ -144,6 +144,7 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     private String clubName; //会所名称
     private Integer orderArchiveId; //订单资料id
     private String rebateFee; //主订单返佣服务费
+    private String shopPostFlag; //免邮标志 运费：-1到付，0包邮，1需要运费,-2仪器到付其它包邮
     private String postageInfo; //运费字符串
 
 
@@ -162,7 +163,13 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     private String remarkImage9;
     private String remarkImage10;
 
+    public String getShopPostFlag() {
+        return shopPostFlag;
+    }
 
+    public void setShopPostFlag(String shopPostFlag) {
+        this.shopPostFlag = shopPostFlag;
+    }
     public List<CmOrderPaymentVoucherVo> getVoucherVo() {
         return voucherVo;
     }

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

@@ -8,11 +8,20 @@ import java.util.List;
  * 收款详情Vo类
  */
 public class ReceiptDetailVo {
+    public String getOrderStatusFlag() {
+        return orderStatusFlag;
+    }
+
+    public void setOrderStatusFlag(String orderStatusFlag) {
+        this.orderStatusFlag = orderStatusFlag;
+    }
+
     private String receiptID; //识别款项Id（对应cm_discern_receipt表）
     private String receiptType; //收款款项类型：1订单款，2非订单款，3返佣款
     private String payType;//付款类型：1建设银行7297、2广发银行0115、3中信银行7172、4中信银行0897、5中信银行0897-财付通、6中信银行0897-支付宝、7线上-支付宝、8线上-微信支付、9线上-快钱支付、10口头返佣',
     private Double receiptAmount;//收款金额
     private String receiptDate;        // 收款时间
+    private String orderStatusFlag;        // 收款状态：1待确认、2已确认(待审核)、3审核通过、4审核未通过、5收款撤销
     private String receiptStatus;        // 收款状态：1待确认、2已确认(待审核)、3审核通过、4审核未通过、5收款撤销
     private String confirmType;// 确认订单类型：1小额抹平确认，2大额抹平确认，3大额退款余额，4确认关联
     private String smsContent;     //短信内容

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

@@ -138,75 +138,76 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
         if (CollectionUtils.isNotEmpty(relations) && relations.size() > 1) {
             receiptOrderFlag = true;
         }
-        vo.setReceiptOrderFlag(receiptOrderFlag);//设置一款多单状态
+//        vo.setReceiptOrderFlag(receiptOrderFlag);//设置一款多单状态
         List<ReceiptOrderInfoVo> orderInfos = new ArrayList<>(); //一个收款可能会关联了一个或多个订单
-        for (CmReceiptOrderRelation relation : relations) {
-            ReceiptOrderInfoVo roi = null; //这是通过订单列表上的一条收款记录对应的多个订单中的一个订单
-            if ("1".equals(relation.getRelationType())) { // relation.orderID 指的是子订单id
-                roi = cmDiscernReceiptDao.getOrderInfoByShopOrderID(relation.getOrderID());
-                if (null != roi) {
-                    roi.setRelationType("1");
-                    if ("5".equals(vo.getReceiptType())) {
-                        //供应商退款,已退金额
-                        List<CmRefundShopRecord> records = cmRefundShopRecordDao.getRefundedRecords(roi.getShopOrderID());
-                        if (records != null && records.size() > 0) {
-                            Double collect = records.stream().mapToDouble(CmRefundShopRecord::getRefundAmount).sum();
-                            roi.setRefundsAmount(collect);
-                        } else {
-                            roi.setRefundsAmount(0d);
-                        }
-                        //查询收款供应商退款金额
-                        /*BigDecimal shopRefundAmount = cmRefundShopRecordDao.findShopRefund(Integer.valueOf(roi.getShopOrderID()));
-                        BigDecimal refundsAmount = MathUtil.add(roi.getRefundsAmount(), shopRefundAmount);
-                        roi.setRefundsAmount(refundsAmount.doubleValue());*/
-                    }
-                }
-            }
-            if ("2".equals(relation.getRelationType())) { // relation.orderID 指的是主订单id
-                roi = cmDiscernReceiptDao.getOrderInfoByOrderID(relation.getOrderID());
-                if (null != roi) {
-                    roi.setRelationType("2");
-                    if (0 == roi.getOnlinePayFlag()) {
-                        // 可以线上支付，查询子订单信息
-                        List<NewShopOrder> shopOrderInfos = cmDiscernReceiptDao.getShopOrderInfos(null, relation.getOrderID());
-                        roi.setShopOrderInfos(shopOrderInfos);
-                    }
-                }
-            }
-            if (null != roi) {
-                List<ReceiptRecordVo> receiptRecordByOrderID = cmDiscernReceiptDao.findReceiptRecordByOrderID(roi);
-                //                暂时不启用抹平明细
-                if (CollectionUtils.isNotEmpty(receiptRecordByOrderID)) {
-                    for (ReceiptRecordVo v : receiptRecordByOrderID) {
-                        if (StringUtils.equals("3", v.getConfirmType())) {
-                            String id = v.getReceiptID();
-                            double returnBalanceAmount = cmDiscernReceiptDao.getReturnBalanceAmount(id);
-                            v.setReturnBalanceAmount(returnBalanceAmount);
-                        }
-                        //统计当前已收
-                        double associateAmount = cmDiscernReceiptDao.getAssociateAmount(String.valueOf(roi.getOrderID()));
-                        v.setOrderReceivedAmount(associateAmount);
-                    }
-                }
-                //一个订单又包含了多个收款记录
-                roi.setReceiptRecordVo(receiptRecordByOrderID);
-                orderInfos.add(roi);
-            }
-        }
-        if ("6".equals(vo.getReceiptType())) {
-            // 3超级会员款
-            ReceiptVipInfoVo receiptVipInfo = cmDiscernReceiptDao.getReceiptVipInfo(vo.getReceiptID());
-            vo.setVipInfo(receiptVipInfo);
-        }
-        if ("7".equals(vo.getReceiptType())) {
-            // 二手商品上架费
-
-        }
-        if ("8".equals(vo.getReceiptType())) {
-            //优惠券购买费
-            ReceipCouponInfoVo couponInfo = cmDiscernReceiptDao.getCouponInfo(vo.getReceiptID());
-            vo.setCouponInfo(couponInfo);
-        }
+        orderInfos.add(cmDiscernReceiptDao.getOrderInfoByShopOrderID(cmDiscernReceipt.getShopOrderId().toString()));
+//        for (CmReceiptOrderRelation relation : relations) {
+//            ReceiptOrderInfoVo roi = null; //这是通过订单列表上的一条收款记录对应的多个订单中的一个订单
+//            if ("1".equals(relation.getRelationType())) { // relation.orderID 指的是子订单id
+//                roi = cmDiscernReceiptDao.getOrderInfoByShopOrderID(relation.getOrderID());
+//                if (null != roi) {
+//                    roi.setRelationType("1");
+//                    if ("5".equals(vo.getReceiptType())) {
+//                        //供应商退款,已退金额
+//                        List<CmRefundShopRecord> records = cmRefundShopRecordDao.getRefundedRecords(roi.getShopOrderID());
+//                        if (records != null && records.size() > 0) {
+//                            Double collect = records.stream().mapToDouble(CmRefundShopRecord::getRefundAmount).sum();
+//                            roi.setRefundsAmount(collect);
+//                        } else {
+//                            roi.setRefundsAmount(0d);
+//                        }
+//                        //查询收款供应商退款金额
+//                        /*BigDecimal shopRefundAmount = cmRefundShopRecordDao.findShopRefund(Integer.valueOf(roi.getShopOrderID()));
+//                        BigDecimal refundsAmount = MathUtil.add(roi.getRefundsAmount(), shopRefundAmount);
+//                        roi.setRefundsAmount(refundsAmount.doubleValue());*/
+//                    }
+//                }
+//            }
+//            if ("2".equals(relation.getRelationType())) { // relation.orderID 指的是主订单id
+//                roi = cmDiscernReceiptDao.getOrderInfoByOrderID(relation.getOrderID());
+//                if (null != roi) {
+//                    roi.setRelationType("2");
+//                    if (0 == roi.getOnlinePayFlag()) {
+//                        // 可以线上支付，查询子订单信息
+//                        List<NewShopOrder> shopOrderInfos = cmDiscernReceiptDao.getShopOrderInfos(null, relation.getOrderID());
+//                        roi.setShopOrderInfos(shopOrderInfos);
+//                    }
+//                }
+//            }
+//            if (null != roi) {
+//                List<ReceiptRecordVo> receiptRecordByOrderID = cmDiscernReceiptDao.findReceiptRecordByOrderID(roi);
+//                //                暂时不启用抹平明细
+//                if (CollectionUtils.isNotEmpty(receiptRecordByOrderID)) {
+//                    for (ReceiptRecordVo v : receiptRecordByOrderID) {
+//                        if (StringUtils.equals("3", v.getConfirmType())) {
+//                            String id = v.getReceiptID();
+//                            double returnBalanceAmount = cmDiscernReceiptDao.getReturnBalanceAmount(id);
+//                            v.setReturnBalanceAmount(returnBalanceAmount);
+//                        }
+//                        //统计当前已收
+//                        double associateAmount = cmDiscernReceiptDao.getAssociateAmount(String.valueOf(roi.getOrderID()));
+//                        v.setOrderReceivedAmount(associateAmount);
+//                    }
+//                }
+//                //一个订单又包含了多个收款记录
+//                roi.setReceiptRecordVo(receiptRecordByOrderID);
+//                orderInfos.add(roi);
+//            }
+//        }
+//        if ("6".equals(vo.getReceiptType())) {
+//            // 3超级会员款
+//            ReceiptVipInfoVo receiptVipInfo = cmDiscernReceiptDao.getReceiptVipInfo(vo.getReceiptID());
+//            vo.setVipInfo(receiptVipInfo);
+//        }
+//        if ("7".equals(vo.getReceiptType())) {
+//            // 二手商品上架费
+//
+//        }
+//        if ("8".equals(vo.getReceiptType())) {
+//            //优惠券购买费
+//            ReceipCouponInfoVo couponInfo = cmDiscernReceiptDao.getCouponInfo(vo.getReceiptID());
+//            vo.setCouponInfo(couponInfo);
+//        }
         vo.setOrderInfos(orderInfos);
         return vo;
     }

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

@@ -494,7 +494,7 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
             Double returnedPurchaseFee = cmReturnedPurchaseDao.refundTotalMoney(order.getOrderID());
             Double returnValue = 0d;   //退货价值
             if (returnedPurchaseFee != null) {
-                if (order.getDiscountFee() >= returnedPurchaseFee) {
+                if (null==order.getDiscountFee()||order.getDiscountFee() >= returnedPurchaseFee) {
                     returnValue = 0d;   //如果经理折扣大于退款(退货)总金额之和  那么先抵扣经理折扣  退款价值为0
                 } else {
                     returnValue = returnedPurchaseFee - order.getDiscountFee(); //抵用完经理折扣后才是真实价值

src/main/java/com/caimei/modules/order/web/CmDiscernReceiptController.java

@@ -155,14 +155,13 @@ public class CmDiscernReceiptController extends BaseController {
     @RequestMapping(value = "detail")
     public String detail(CmDiscernReceipt cmDiscernReceipt, Model model) {
         ReceiptDetailVo vo = cmDiscernReceiptService.detail(cmDiscernReceipt);
-        CmDiscernReceipt op = cmDiscernReceiptService.orderlist(cmDiscernReceipt);
+//        CmDiscernReceipt op = cmDiscernReceiptService.orderlist(cmDiscernReceipt);
         //支付凭证
-        String orderID = cmDiscernReceipt.getOrderID() != null &&!cmDiscernReceipt.getOrderID().equals("") ?  cmDiscernReceipt.getOrderID():"0";
-        List<CmOrderPaymentVoucherVo> voucherVo = newOrderService.findVoucherVoOrderID(Integer.valueOf(orderID));
+        List<CmOrderPaymentVoucherVo> voucherVo = newOrderService.findVoucherVoOrderID(cmDiscernReceipt.getShopOrderId());
         model.addAttribute("voucherVo", voucherVo.size()==0?null:voucherVo);
         model.addAttribute("organizeID", cmDiscernReceipt.getOrganizeID());
         model.addAttribute("vo", vo);
-        model.addAttribute("op", op);
+//        model.addAttribute("op", op);
         model.addAttribute("checkMan", cmDiscernReceipt.getCheckMan());
 
         return "modules/order/cmDiscernReceiptForm";

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -1209,6 +1209,11 @@ public class NewOrderController extends BaseController {
     @RequiresPermissions("order:order:view")
     @RequestMapping("detail")
     public String detail(NewOrder order, Model model) {
+        if(order.getShopOrderID()!=null){
+            List<NewShopOrder>  newShopOrders= order.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderID().equals(order.getShopOrderID())).collect(Collectors.toList());
+            order.setNewShopOrders(newShopOrders);
+//            order.getNewShopOrders().get(0).setPostageInfo();
+        }
         BpClause bpClause = new BpClause();
         bpClause.setEnabledStatus("1");
         List<BpClause> bpClauses = bpClauseService.findList(bpClause);
@@ -1285,26 +1290,25 @@ public class NewOrderController extends BaseController {
             }
             Double ColdChina = Double.valueOf(700);
             String PostageInfo = null;
-
-            if (newShopOrder.getIsColdChina()==1) {
-                if ("-1" == order.getFreePostFlag()) {
+            if (null!=newShopOrder.getIsColdChina()&&newShopOrder.getIsColdChina()==1) {
+                if ("-1" == newShopOrder.getShopPostFlag()) {
                     // 到付
-                    PostageInfo = "￥" + newShopOrder.getFreePostageFee() + "(" + (newShopOrder.getIsColdChina()==1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
-                } else if ("0" == order.getFreePostFlag()) {
+                    PostageInfo = "￥" + ColdChina + "(" + (newShopOrder.getIsColdChina()==1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
+                } else if ("0" == newShopOrder.getShopPostFlag()) {
                     // 包邮
-                    PostageInfo = "￥" + newShopOrder.getFreePostageFee() + "(" + (newShopOrder.getIsColdChina()==1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
+                    PostageInfo = "￥" + ColdChina+ "(" + (newShopOrder.getIsColdChina()==1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
                 } else {
                     // 有运费
-                    PostageInfo = "￥" + newShopOrder.getShopPostFee() + "(" + (newShopOrder.getIsColdChina()==1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(order.getFreight(), ColdChina)+ ")";
+                    PostageInfo = "￥" + MathUtil.add(newShopOrder.getShopPostFee(), ColdChina) + "(" + (newShopOrder.getIsColdChina()==1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + newShopOrder.getShopPostFee()+ ")";
                 }
             } else {
-                PostageInfo = order.getFreePostFlag() == "-1" ? "到付" : order.getFreePostFlag() == "0" ? "包邮" : "￥" + newShopOrder.getShopPostFee();
+                PostageInfo = newShopOrder.getShopPostFlag() == "-1" ? "到付" : newShopOrder.getShopPostFlag() == "0" ? "包邮" : "￥" + newShopOrder.getShopPostFee();
             }
-            List<CmOrderPaymentVoucherVo> voucherVo = newOrderService.findVoucherVoOrderID(newShopOrder.getShopOrderID() );
 
+            //支付凭证
+            List<CmOrderPaymentVoucherVo> voucherVo = newOrderService.findVoucherVoOrderID(newShopOrder.getShopOrderID() );
             newShopOrder.setPostageInfo(PostageInfo);
             newShopOrder.setVoucherVo(voucherVo);
-            //支付凭证
         }
         if (order.getProductCount() <= count) {
             order.setSplitFlag("0");
@@ -1347,34 +1351,8 @@ public class NewOrderController extends BaseController {
                 returnValue = returnedPurchaseFee - order.getDiscountFee(); //抵用完经理折扣后才是真实价值
             }
         }
-
-//        //联合丽格运费
-//        String PostageInfo = null;
-//        // 拼接运费信息--联合丽格
-//        boolean isColdChina = order.getNewShopOrders().stream().map(NewShopOrder::getIsColdChina).collect(Collectors.toList()).contains(1);
-//        Double ColdChina = Double.valueOf(700);
-//
-//        if (isColdChina) {
-//            if ("-1" == order.getFreePostFlag()) {
-//                // 到付
-//                PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
-//            } else if ("0" == order.getFreePostFlag()) {
-//                // 包邮
-//                PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
-//            } else {
-//                // 有运费
-//                PostageInfo = "￥" + order.getFreight() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(order.getFreight(), ColdChina)+ ")";
-//            }
-//        } else {
-//            PostageInfo = order.getFreePostFlag() == "-1" ? "到付" : order.getFreePostFlag() == "0" ? "包邮" : "￥" + order.getFreight();
-//        }
-//        //支付凭证
-//        Integer orderID = order.getOrderID() == null ? 0: order.getOrderID();
-//        List<CmOrderPaymentVoucherVo> voucherVo = newOrderService.findVoucherVoOrderID(order.getOrderID());
         //订单已收金额
         Double brokerage = cmUtilsDao.selectPayTotalFees(order.getOrderID());
-//        model.addAttribute("voucherVo", voucherVo.size()==0?null:voucherVo);
-//        model.addAttribute("postageInfo", PostageInfo);
         model.addAttribute("brokerage", brokerage);
         Double receiptAmount = cmDiscernReceiptService.findOrderReceipt(order.getOrderID());
         model.addAttribute("returnValue", returnValue);

src/main/java/com/caimei/modules/product/dao/CmOrganizeProductInfoMapper.java

@@ -0,0 +1,74 @@
+package com.caimei.modules.product.dao;
+
+import com.caimei.modules.product.entity.CmOrganizeProductInfo;
+import com.caimei.modules.product.entity.Product;
+import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 商品组织信息（采购平台独立字段）Mapper接口
+ *
+ * @author Kaick
+ * @date 2023-06-17
+ */
+@MyBatisDao
+public interface CmOrganizeProductInfoMapper extends CrudDao<CmOrganizeProductInfo>
+{
+
+    /**
+     * 查询商品组织信息（采购平台独立字段）
+     *
+     * @param cmOrganizeProductInfo 商品组织信息（采购平台独立字段）
+     * @return 商品组织信息（采购平台独立字段）集合
+     */
+    public CmOrganizeProductInfo getByCmOrganizeProductInfo(CmOrganizeProductInfo cmOrganizeProductInfo);
+
+    /**
+     * 查询商品组织信息（采购平台独立字段）列表
+     *
+     * @param cmOrganizeProductInfo 商品组织信息（采购平台独立字段）
+     * @return 商品组织信息（采购平台独立字段）集合
+     */
+    public List<CmOrganizeProductInfo> getCmOrganizeProductInfoList(CmOrganizeProductInfo cmOrganizeProductInfo);
+
+    /**
+     * 新增商品组织信息（采购平台独立字段）
+     *
+     * @param cmOrganizeProductInfo 商品组织信息（采购平台独立字段）
+     * @return 结果
+     */
+    public int addCmOrganizeProductInfo(CmOrganizeProductInfo cmOrganizeProductInfo);
+
+    /**
+     * 修改商品组织信息（采购平台独立字段）
+     *
+     * @param cmOrganizeProductInfo 商品组织信息（采购平台独立字段）
+     * @return 结果
+     */
+    public int updateCmOrganizeProductInfo(CmOrganizeProductInfo cmOrganizeProductInfo);
+    /**
+     * 删除商品组织信息（采购平台独立字段）
+     *
+     * @param organizeId 商品组织信息（采购平台独立字段）主键
+     * @return 结果
+     */
+    public int delCmOrganizeProductInfoByOrganizeId(@Param("organizeId")Integer organizeId, @Param("productId")Integer productId);
+
+    /**
+     * 批量删除商品组织信息（采购平台独立字段）
+     *
+     * @param organizeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int delCmOrganizeProductInfoByOrganizeIds(@Param("organizeIds")Integer[] organizeIds,  @Param("productId")Integer productId);
+    /**
+     * 批量删除商品组织信息（采购平台独立字段）
+     *
+     * @param organizeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int delNotCmOrganizeProductInfoByOrganizeIds(@Param("organizeIds") Integer[] organizeIds,  @Param("productId")Integer productId);
+}

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

@@ -0,0 +1,62 @@
+package com.caimei.modules.product.entity;
+
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.apache.ibatis.type.Alias;
+
+/**
+ * 商品组织信息（采购平台独立字段）对象 cm_organize_product_info
+ *
+ * @author Kaick
+ * @date 2023-06-17
+ */
+//@Accessors(chain  = true )
+@Alias("CmOrganizeProductInfo")
+public class CmOrganizeProductInfo  extends DataEntity<CmOrganizeProductInfo> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织id
+     */
+    private Integer organizeId;
+
+    /**
+     * 商品id
+     */
+    private Integer productId;
+    /**
+     * 0逻辑删除 1待审核 2已上架 3已下架 8审核未通过 9已隐身 10已冻结
+     */
+    private Integer validFlag;
+
+    public Integer getOrganizeId() {
+        return organizeId;
+    }
+
+    public void setOrganizeId(Integer organizeId) {
+        this.organizeId = organizeId;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public Integer getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(Integer validFlag) {
+        this.validFlag = validFlag;
+    }
+
+
+
+}

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

@@ -10,7 +10,7 @@ import com.thinkgem.jeesite.common.persistence.DataEntity;
  * @version 2019-02-21
  */
 public class RepeatPurchasePrice extends DataEntity<RepeatPurchasePrice> {
-	
+
 	private static final long serialVersionUID = 1L;
 	private Integer skuId;
 	private Integer userId;		// 用户id
@@ -19,6 +19,7 @@ public class RepeatPurchasePrice extends DataEntity<RepeatPurchasePrice> {
 	private String shopName;		// 供应商名称
 	private String taxRate;		// 税率
 	private String currentPrice;		// 当前价
+	private String organizeId;		// 组织id
 	private String createTime;		// 下单时间
 	private String userName;	//用户名称
 	private String mobile;		//用户手机
@@ -31,6 +32,14 @@ public class RepeatPurchasePrice extends DataEntity<RepeatPurchasePrice> {
 	private String delFlag;   //删除标记 0否 其余是
 	private String unit;  //规格
 
+	public String getOrganizeId() {
+		return organizeId;
+	}
+
+	public void setOrganizeId(String organizeId) {
+		this.organizeId = organizeId;
+	}
+
 	public Integer getSkuId() {
 		return skuId;
 	}
@@ -70,7 +79,7 @@ public class RepeatPurchasePrice extends DataEntity<RepeatPurchasePrice> {
 	public void setUserId(Integer userId) {
 		this.userId = userId;
 	}
-	
+
 	public Integer getProductId() {
 		return productId;
 	}
@@ -78,7 +87,7 @@ public class RepeatPurchasePrice extends DataEntity<RepeatPurchasePrice> {
 	public void setProductId(Integer productId) {
 		this.productId = productId;
 	}
-	
+
 	public Integer getShopId() {
 		return shopId;
 	}
@@ -86,7 +95,7 @@ public class RepeatPurchasePrice extends DataEntity<RepeatPurchasePrice> {
 	public void setShopId(Integer shopId) {
 		this.shopId = shopId;
 	}
-	
+
 	@Length(min=0, max=50, message="供应商名称长度必须介于 0 和 50 之间")
 	public String getShopName() {
 		return shopName;
@@ -188,4 +197,4 @@ public class RepeatPurchasePrice extends DataEntity<RepeatPurchasePrice> {
 	public void setBindMobile(String bindMobile) {
 		this.bindMobile = bindMobile;
 	}
-}
+}

src/main/java/com/caimei/modules/product/service/CmSecondHandDetailService.java

@@ -3,10 +3,13 @@ package com.caimei.modules.product.service;
 import java.util.Date;
 import java.util.List;
 
+import com.caimei.modules.product.dao.CmOrganizeProductInfoMapper;
 import com.caimei.modules.product.dao.ProductDao;
+import com.caimei.modules.product.entity.CmOrganizeProductInfo;
 import com.caimei.modules.product.entity.Product;
 import com.caimei.modules.product.entity.Shop;
 import com.thinkgem.jeesite.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,6 +32,8 @@ public class CmSecondHandDetailService extends CrudService<CmSecondHandDetailDao
 
     @Resource
     private CmSecondHandDetailDao cmSecondHandDetailDao;
+    @Autowired
+    CmOrganizeProductInfoMapper cmOrganizeProductInfoMapper;
     @Resource
     private ProductDao productDao;
 
@@ -70,6 +75,13 @@ public class CmSecondHandDetailService extends CrudService<CmSecondHandDetailDao
         if (null != productID) {
             // 更新
             productDao.updateByPrimaryKeySelective(product);
+            if(StringUtils.isNotBlank(product.getValidFlag())){
+                CmOrganizeProductInfo cmOrganizeProductInfo = new CmOrganizeProductInfo();
+                cmOrganizeProductInfo.setOrganizeId(0);
+                cmOrganizeProductInfo.setProductId(product.getProductID());
+                cmOrganizeProductInfo.setValidFlag(Integer.valueOf(product.getValidFlag()));
+                cmOrganizeProductInfoMapper.updateCmOrganizeProductInfo(cmOrganizeProductInfo);
+            }
         } else {
             // 插入
             productDao.insertProduct(product);

src/main/java/com/caimei/modules/product/service/ProductNewService.java

@@ -10,6 +10,7 @@ import com.caimei.modules.hehe.entity.CmHeheProduct;
 import com.caimei.modules.newhome.dao.NewPageFloorDao;
 import com.caimei.modules.newhome.entity.NewPageFloorImage;
 import com.caimei.modules.opensearch.GenerateUtils;
+import com.caimei.modules.product.dao.CmOrganizeProductInfoMapper;
 import com.caimei.modules.product.dao.CmPromotionDao;
 import com.caimei.modules.product.dao.ProductDao;
 import com.caimei.modules.product.dao.ProductNewDao;
@@ -51,6 +52,8 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
     @Autowired
     ProductNewDao productNewDao;
     @Autowired
+    CmOrganizeProductInfoMapper cmOrganizeProductInfoMapper;
+    @Autowired
     RedisService redisService;
     @Autowired
     GenerateUtils generateUtils;
@@ -117,7 +120,7 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
                 Integer costCheckFlag = sku.getCostCheckFlag();
                 p.setCostCheckFlag(costCheckFlag.toString());
                 if (1 == costCheckFlag) {
-                    p.setCostPrice(sku.getCostPrice().toString());
+                    p.setCostPrice(sku.getCostPrice()!=null?sku.getCostPrice().toString():null);
                 } else {
                     p.setSqlShopPercent(sku.getShopPercent());
                 }
@@ -141,6 +144,11 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
 
     public void fastSave(Product product) {
         productNewDao.updateByPrimaryKeySelective(product);
+        CmOrganizeProductInfo cmOrganizeProductInfo = new CmOrganizeProductInfo();
+        cmOrganizeProductInfo.setOrganizeId(0);
+        cmOrganizeProductInfo.setProductId(product.getProductID());
+        cmOrganizeProductInfo.setValidFlag(Integer.valueOf(product.getValidFlag()));
+        cmOrganizeProductInfoMapper.updateCmOrganizeProductInfo(cmOrganizeProductInfo);
     }
 
     public List<ProductImage> getImageList(Integer productId) {
@@ -275,6 +283,11 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
         newPageFloorDao.insertFloorImage(floorImage);
         product.setFloorId(productNewDao.newFloorId());
         productNewDao.updateByPrimaryKeySelective(product);
+        CmOrganizeProductInfo cmOrganizeProductInfo = new CmOrganizeProductInfo();
+        cmOrganizeProductInfo.setOrganizeId(0);
+        cmOrganizeProductInfo.setProductId(product.getProductID());
+        cmOrganizeProductInfo.setValidFlag(Integer.valueOf(product.getValidFlag()));
+        cmOrganizeProductInfoMapper.updateCmOrganizeProductInfo(cmOrganizeProductInfo);
         cleanRedisCache();
 
     }

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -20,6 +20,7 @@ import com.thinkgem.jeesite.common.service.CrudService;
 import com.thinkgem.jeesite.common.utils.Encodes;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -34,6 +35,8 @@ public class ProductService extends CrudService<ProductDao, Product> {
 
     @Resource
     private ProductDao productDao;
+    @Autowired
+    CmOrganizeProductInfoMapper cmOrganizeProductInfoMapper;
     @Resource
     private CmBrandDao cmBrandDao;
     @Resource
@@ -322,14 +325,28 @@ public class ProductService extends CrudService<ProductDao, Product> {
         if (null != product.getSkuList()) {
             List<Integer> collect = product.getSkuList().stream().map(CmSku::getOrganizeId).collect(Collectors.toList());
             collect.forEach(c -> {
-                if (!listMall.contains(c)) {
+                if (c!=null&&!listMall.contains(c)) {
                     listMall.add(c);
                 }
             });
             String strip = StringUtils.strip(listMall.toString(), "[]");
-            product.setGroundMall(strip.replaceAll(",","##").trim());
+            product.setGroundMall(strip.replaceAll(",", "##").trim());
+            cmOrganizeProductInfoMapper.delNotCmOrganizeProductInfoByOrganizeIds(listMall.toArray(new Integer[listMall.size()]),product.getProductID());
+            listMall.forEach(s -> {
+                CmOrganizeProductInfo cmOrganizeProductInfoOrganizeId = new CmOrganizeProductInfo();
+                cmOrganizeProductInfoOrganizeId.setOrganizeId(s);
+                if ( null == cmOrganizeProductInfoMapper.getByCmOrganizeProductInfo(cmOrganizeProductInfoOrganizeId)){
+                    CmOrganizeProductInfo cmOrganizeProductInfo = new CmOrganizeProductInfo();
+                    cmOrganizeProductInfo.setOrganizeId(s);
+                    cmOrganizeProductInfo.setProductId(product.getProductID());
+                    cmOrganizeProductInfo.setValidFlag(1);
+                    cmOrganizeProductInfoMapper.addCmOrganizeProductInfo(cmOrganizeProductInfo);
+                }
+
+            });
         } else {
             product.setGroundMall("");
+            cmOrganizeProductInfoMapper.delCmOrganizeProductInfoByOrganizeIds(new Integer[]{0, 4},product.getProductID());
         }
         if (null != product.getShopType() && 2 == product.getShopType()) {
             product.setValidFlag("2");
@@ -374,6 +391,13 @@ public class ProductService extends CrudService<ProductDao, Product> {
             productDao.updateMainImage(product);
         } else {
             productDao.updateByPrimaryKeySelective(product);
+            if (StringUtils.isNotBlank(product.getValidFlag())) {
+                CmOrganizeProductInfo cmOrganizeProductInfo = new CmOrganizeProductInfo();
+                cmOrganizeProductInfo.setOrganizeId(0);
+                cmOrganizeProductInfo.setProductId(product.getProductID());
+                cmOrganizeProductInfo.setValidFlag(Integer.valueOf(product.getValidFlag()));
+                cmOrganizeProductInfoMapper.updateCmOrganizeProductInfo(cmOrganizeProductInfo);
+            }
             updateSku(product);
         }
         ProductDetailInfo queryProductDetailInfo = productDao.queryProductDetailInfo(product.getProductID());
@@ -388,8 +412,9 @@ public class ProductService extends CrudService<ProductDao, Product> {
         List<CmSku> skuList = null;
         List<CmSku> skuOrganizeList = null;
         if (null != product.getSkuList()) {
-            product.getSkuList().stream().filter(p -> 0 == p.getOrganizeId()).collect(Collectors.toList());
-            product.getSkuList().stream().filter(p -> 4 == p.getOrganizeId()).collect(Collectors.toList());
+            skuList = product.getSkuList();
+//            skuList=product.getSkuList().stream().filter(p -> 0 == p.getOrganizeId()).collect(Collectors.toList());
+//            skuOrganizeList= product.getSkuList().stream().filter(p -> 4 == p.getOrganizeId()).collect(Collectors.toList());
         }
         if (null != skuList && skuList.size() > 0) {
             List<Integer> skuIds = new ArrayList<>();
@@ -425,46 +450,46 @@ public class ProductService extends CrudService<ProductDao, Product> {
             productDao.deletePromotionSku(skuIds, product.getProductID());
         }
         // 外部商城
-        if (null != skuOrganizeList && skuOrganizeList.size() > 0) {
-            List<Integer> skuIds = new ArrayList<>();
-            boolean flag = false;
-            for (CmSku s : skuOrganizeList) {
-                if (null != s.getSkuId()) {
-                    flag = true;
-                }
-            }
-            CmOrganizeProduct mallProduct = new CmOrganizeProduct();
-            if (!flag) {
-                // 插入外部商城商品库
-                // 商品数据赋值
-                mallProduct.setShopId(product.getShopID());
-                mallProduct.setOrganizeId(skuOrganizeList.get(0).getOrganizeId());
-                mallProduct.setProductId(product.getProductID());
-                mallProduct.setLadderPriceFlag(0);
-                mallProduct.setMinBuyNumber(1);
-                mallProduct.setValidFlag(1);
-                mallProduct.setAddTime(new Date());
-                mallProduct.setDelFlag("0");
-                // 插入外部商城商品
-                productDao.insertMallProduct(mallProduct);
-            }
-            skuOrganizeList.forEach(s -> {
-                s.setProductId(product.getProductID());
-                if (StringUtils.isNotBlank(mallProduct.getId())) {
-                    s.setMallProductId(Integer.parseInt(mallProduct.getId()));
-                }
-                if (null != s.getSkuId()) {
-                    productDao.updateOrganizeSku(s);
-                    skuIds.add(s.getSkuId());
-                } else {
-                    productDao.insertOrganizeSku(s);
-                    skuIds.add(s.getSkuId());
-                }
-            });
-            if (null != skuIds && skuIds.size() > 0) {
-                productDao.deleteProductOrganizeSkus(skuIds, product.getProductID());
-            }
-        }
+//        if (null != skuOrganizeList && skuOrganizeList.size() > 0) {
+//            List<Integer> skuIds = new ArrayList<>();
+//            boolean flag = false;
+//            for (CmSku s : skuOrganizeList) {
+//                if (null != s.getSkuId()) {
+//                    flag = true;
+//                }
+//            }
+//            CmOrganizeProduct mallProduct = new CmOrganizeProduct();
+//            if (!flag) {
+//                // 插入外部商城商品库
+//                // 商品数据赋值
+//                mallProduct.setShopId(product.getShopID());
+//                mallProduct.setOrganizeId(skuOrganizeList.get(0).getOrganizeId());
+//                mallProduct.setProductId(product.getProductID());
+//                mallProduct.setLadderPriceFlag(0);
+//                mallProduct.setMinBuyNumber(1);
+//                mallProduct.setValidFlag(1);
+//                mallProduct.setAddTime(new Date());
+//                mallProduct.setDelFlag("0");
+//                // 插入外部商城商品
+//                productDao.insertMallProduct(mallProduct);
+//            }
+//            skuOrganizeList.forEach(s -> {
+//                s.setProductId(product.getProductID());
+//                if (StringUtils.isNotBlank(mallProduct.getId())) {
+//                    s.setMallProductId(Integer.parseInt(mallProduct.getId()));
+//                }
+//                if (null != s.getSkuId()) {
+//                    productDao.updateOrganizeSku(s);
+//                    skuIds.add(s.getSkuId());
+//                } else {
+//                    productDao.insertOrganizeSku(s);
+//                    skuIds.add(s.getSkuId());
+//                }
+//            });
+//            if (null != skuIds && skuIds.size() > 0) {
+//                productDao.deleteProductOrganizeSkus(skuIds, product.getProductID());
+//            }
+//        }
     }
 
     public void addSkus(Product product) {
@@ -644,7 +669,7 @@ public class ProductService extends CrudService<ProductDao, Product> {
     public List<CmSku> findSkuList(Integer productID) {
         List<CmSku> skus = productDao.findSkuListProduct(productID);
         skus.forEach(s -> {
-            s.setOrganizeId(0);
+            s.setCostCheckFlag(2);
             s.ladderPriceList(productDao.findLadderPriceBySku(s.skuId()));
         });
 
@@ -654,7 +679,6 @@ public class ProductService extends CrudService<ProductDao, Product> {
     public List<CmSku> findMallSkuList(Integer productID) {
         List<CmSku> skuOrganizeList = productDao.findSkuOrganizeList(productID);
         skuOrganizeList.forEach(o -> {
-            o.setOrganizeId(4);
             o.setCostCheckFlag(2);
         });
         return skuOrganizeList;

src/main/java/com/caimei/modules/product/web/ProductController.java

@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.caimei.constants.CodeMsg;
 import com.caimei.dfs.image.beens.ImageUploadInfo;
 import com.caimei.modules.common.utils.UploadUtils;
+import com.caimei.modules.product.dao.CmOrganizeProductInfoMapper;
 import com.caimei.modules.product.dao.ProductDao;
 import com.caimei.modules.product.entity.*;
 import com.caimei.modules.product.service.*;
@@ -45,6 +46,8 @@ public class ProductController extends BaseController{
     private ProductService productService;
     @Resource
     private ProductDao productDao;
+    @Autowired
+    CmOrganizeProductInfoMapper cmOrganizeProductInfoMapper;
     @Resource
     private CmUserOrganizeService cmUserOrganizeService;
 
@@ -477,6 +480,13 @@ public class ProductController extends BaseController{
                     product.setProductID(Integer.parseInt(productIdActSort[0]) );
                     product.setActSort(productIdActSort[1]);
                     productDao.updateByPrimaryKeySelective(product);
+                    if(StringUtils.isNotBlank(product.getValidFlag())){
+                        CmOrganizeProductInfo cmOrganizeProductInfo = new CmOrganizeProductInfo();
+                        cmOrganizeProductInfo.setOrganizeId(0);
+                        cmOrganizeProductInfo.setProductId(product.getProductID());
+                        cmOrganizeProductInfo.setValidFlag(Integer.valueOf(product.getValidFlag()));
+                        cmOrganizeProductInfoMapper.updateCmOrganizeProductInfo(cmOrganizeProductInfo);
+                    }
                 }
             }
         }

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -487,10 +487,10 @@ public class ProductNewController extends BaseController {
             for (CmSku s : product.getSkuList()) {
                 if (null != s.getCostCheckFlag() && s.getCostCheckFlag() == 2) {
                     double v = MathUtil.add(MathUtil.add(s.getShopPercent(), s.getOrganizePercent()), s.getCmPercent()).doubleValue();
-                    if (v != 100) {
-                        addMessage(redirectAttributes, "保存商品失败，佣金比例和必须为100");
-                        return "redirect:" + Global.getAdminPath() + "/product/new/productEdit";
-                    }
+//                    if (v != 100) {
+//                        addMessage(redirectAttributes, "保存商品失败，佣金比例和必须为100");
+//                        return "redirect:" + Global.getAdminPath() + "/product/new/productEdit";
+//                    }
                 }
             }
         }

src/main/resources/config/beta/caimei.properties

@@ -186,4 +186,4 @@ aliyun.endpoint=https://oss-cn-shenzhen.aliyuncs.com
 #\u5546\u54C1\u8D44\u6599\u5E93\u6587\u4EF6\u4E34\u65F6\u8DEF\u5F84
 archive.tempPath=/mnt/newdatadrive/data/runtime/tomcat-instance/manager/tempFile/
 #ffmpeg\u8DEF\u5F84
-ffmpeg.path=/mnt/newdatadrive/apps/ffmpeg/ffmpeg-master/bin/ffmpeg
+ffmpeg.path=/mnt/newdatadrive/apps/ffmpeg/ffmpeg-master/bin/ffmpeg

src/main/resources/config/dev/caimei.properties

@@ -12,9 +12,9 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.cj.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.2.100:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+jdbc.url=jdbc:mysql://120.79.25.27:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
 jdbc.username=developer
-jdbc.password=05bZ/OxTB:X+yd%1
+jdbc.password=J5p3tgOVazNl4ydf
 
 
 #jdbc.url=jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai

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

@@ -8,9 +8,11 @@
 		a.invoiceType AS invoiceType, a.taxPoint AS taxRate, a.supplierTaxPoint AS supplierTaxRate, a.commodityType,
 		if(csp.id is not null and csu.id is not null and csp.status=0,1,0) as svipPriceFlag
 		FROM product a LEFT JOIN shop b ON b.shopID=a.shopID
+		left join cm_organize_product_info copi on copi.productId = a.productID
 		left join cm_svip_product csp on a.productID = csp.productId
 		left join cm_svip_user csu on csu.userId = #{userId} and csu.delFlag = '0' and now() <![CDATA[ < ]]> csu.endTime
 		<where>
+			a.groundMall like CONCAT('%', copi.organizeId, '%')
 			<if test="purchaseProductName != null and purchaseProductName != ''">
 				AND a.name LIKE concat('%',#{purchaseProductName},'%')
 			</if>
@@ -20,7 +22,8 @@
 			<if test="shopName != null and shopName != ''">
 				AND b.name like concat('%',#{shopName},'%')
 			</if>
-			and (a.validFlag=2 or a.validFlag = 9)
+			and (copi.validFlag=2 or copi.validFlag = 9)
+-- 			and (a.validFlag=2 or a.validFlag = 9)
 			AND a.productID != 999
 			and a.productCategory = 1
 		</where>
@@ -38,11 +41,15 @@
 		cs.price,a.`productID` as productId,a.productCode productNo,a.mainImage image
 		,cs.costCheckFlag,cs.costPrice,cs.shopPercent, cs.normalPrice
 		,a.productCategory as "productCategory",cshd.secondHandType as "secondHandType",cs.ladderPriceFlag
-		,a.includedTax,a.invoiceType
+		,a.includedTax
+		,a.invoiceType
+		,cs.organizeId
 		FROM product a LEFT JOIN shop b ON b.shopID=a.shopID
-		left join cm_sku cs on a.productID=cs.productId
+		left join cm_organize_product_info copi on copi.productId = a.productID
+		left join cm_sku cs on a.productID=cs.productId and copi.organizeId = cs.organizeId
 		left join cm_second_hand_detail cshd on cshd.productID = a.productID
 		<where>
+			a.groundMall like CONCAT('%', copi.organizeId, '%')
 			<if test="purchaseProductName != null and purchaseProductName != ''">
 				AND a.name LIKE concat('%',#{purchaseProductName},'%')
 			</if>
@@ -52,7 +59,8 @@
 			<if test="shopName != null and shopName != ''">
 				AND b.name like concat('%',#{shopName},'%')是否含税
 			</if>
-			and a.validFlag=2
+			and copi.validFlag=2
+-- 			and a.validFlag=2
 			AND a.productID != 999
 			and a.productCategory = 2
 			and cshd.sold != 1

src/main/resources/mappings/modules/cmpage/CmPageCentreMapper.xml

@@ -198,11 +198,12 @@
 		FROM
 		  new_page_floor_image a
 		  LEFT JOIN product p ON a.productId = p.productID
-		left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
+		left join cm_organize_product_info copi on copi.productId = p.productID
 		  LEFT JOIN shop s on p.shopID = s.shopID
 		  left join cm_hehe_product chp on a.productId = chp.productId
 		WHERE
 		  a.centreId = #{centreId}
+		and p.groundMall like CONCAT('%', copi.organizeId, '%')
           <if test="type != null and type == '8'">
               and chp.id is not null
           </if>

src/main/resources/mappings/modules/hehe/CmHeheActivityProductMapper.xml

@@ -185,7 +185,9 @@
     </select>
 
     <select id="findDiscountSku" resultType="com.caimei.modules.product.entity.CmSku">
-        select chds.discountPrice, chds.productId, chds.skuId, chs.price, cs.unit
+        select chds.discountPrice, chds.productId, chds.skuId, chs.price
+                                 , cs.unit
+                                 , cs.organizeId
         from cm_hehe_discount_activity_sku chds
                  left join cm_hehe_sku chs on chds.skuId = chs.skuId
                  left join cm_sku cs on chs.skuId = cs.skuId
@@ -213,4 +215,4 @@
     </delete>
 
 
-</mapper>
+</mapper>

src/main/resources/mappings/modules/hehe/CmHeheProductMapper.xml

@@ -297,6 +297,7 @@
                ifnull(cs.shopPercent, 0) as shopPercent,
                ifnull(cs.costCheckFlag, 0)    as costType,
                ifnull(cs.costPrice, 0)        as costPrice
+            ,cs.organizeId
         from cm_sku cs
                  left join cm_hehe_sku chs on cs.skuId = chs.skuId
         where cs.productId = #{productId}

src/main/resources/mappings/modules/newhome/NewPageFloorMapper.xml

@@ -229,9 +229,10 @@
 		FROM
 		  new_page_floor_image a
 		  LEFT JOIN product p ON a.productId = p.productID
-		  left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
+		  left join cm_organize_product_info copi on copi.productId = p.productID
 		WHERE
 		  a.floorId = #{floorId}
+		and p.groundMall like CONCAT('%', copi.organizeId, '%')
 	</select>
 
 	<insert id="insertFloorContent">

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

@@ -86,39 +86,30 @@
 
 
     <select id="findList" resultType="CmDiscernReceipt">
-        -- 	relationType值为1是为子订单ID,为2时为主订单ID）
-        SELECT
+        (SELECT
         <include refid="cmDiscernReceiptColumns"/>,
-        cso_s.orderID AS orderID,
-        cso_s.shopOrderNo as shopOrderNos,
-        cso.shopOrderId as shopOrderId,
+        cso.orderId AS orderID,
         cso.shopOrderNo as shopOrderNo,
+        cso.shopOrderId as shopOrderId,
         cof.bankAccount AS bankNameType,
         s.checkMan,
-        IF(crr.relationType = '1', s.name,IFNULL(s_a.name,'')) AS shopName,
-        (case when crr.relationType = '1' then u_cr.userName else u.userName
-        end) AS "userName",
-        (case when crr.relationType = '1' then u_cr.name else u.name
-        end) AS "name",
+        s.name AS shopName,
+        u.userName AS "userName",
+        u.name AS "name",
         IF(crr.relationType = '6',(SELECT NAME FROM USER mu WHERE mu.userId=ccb.userId),'') AS "backname",
         cr.organizeID AS organizeID
         FROM cm_discern_receipt a
-        left join cm_receipt_order_relation crr on crr.receiptID = a.id and crr.delFlag = '0'
+
+        LEFT JOIN cm_receipt_order_relation crr ON crr.receiptId = a.id AND crr.delFlag = '0'
         LEFT JOIN cm_coupon_buyrecord ccb ON crr.couponRecordId=ccb.id
-        -- 主订单
-        left join cm_order cr on cr.orderID = crr.orderID
-        left join user u on u.userID = cr.userID
-        -- 子订单
-        left join cm_shop_order cso on cso.shopOrderID = crr.shopOrderID
-        left join cm_order cso_cr on cso.orderID = cso_cr.orderID
-        LEFT JOIN USER u_cr ON u_cr.userID = cso_cr.userID
-            -- 供应商
+        LEFT JOIN cm_order cr ON cr.orderId = crr.orderId
+        LEFT JOIN cm_shop_order cso ON cso.orderId = cr.orderId
         LEFT JOIN shop s ON s.shopID = cso.shopID
-        LEFT JOIN cm_shop_order cso_s ON cso_s.shopOrderID = a.shopOrderID
-        LEFT JOIN cm_shop_order cso_a ON cso_a.shopOrderID = crr.shopOrderID
-        LEFT JOIN shop s_a ON s_a.shopID = cso_a.shopID
+        left join user u on u.userID = cr.userID
+        LEFT JOIN club c ON cr.userId = c.userId
         LEFT JOIN cm_offline_collection cof ON a.payType = cof.type
         <where>
+            crr.relationType != 1
             <if test="id != null and id != '' and id != 0 ">
                 AND a.id = #{id}
             </if>
@@ -143,21 +134,21 @@
             <if test="receiptType != null and receiptType != ''">
                 <if test="receiptType==2 and newReceiptType==3">
                     and (a.receiptType = 9)
-            or a.receiptType = #{receiptType}
+                    or a.receiptType = #{receiptType}
                 </if>
                 <if test="receiptType!=2">
                     AND a.receiptType = #{receiptType}
                 </if>
                 AND a.receiptType = #{receiptType}
             </if>
-        <if test="newReceiptType !=null">
-            <if test="newReceiptType==3">
-              and a.newReceiptType =3
-            </if>
-            <if test="newReceiptType != 3">
-                and a.newReceiptType=#{newReceiptType}
+            <if test="newReceiptType !=null">
+                <if test="newReceiptType==3">
+                    and a.newReceiptType =3
+                </if>
+                <if test="newReceiptType != 3">
+                    and a.newReceiptType=#{newReceiptType}
+                </if>
             </if>
-        </if>
 
             <if test="receiptStatus != null and receiptStatus != ''">
                 AND a.receiptStatus = #{receiptStatus}
@@ -166,7 +157,10 @@
                 AND ((cr.orderNo like concat('%',#{orderNo},'%')) OR (cso.shopOrderNo like concat('%',#{orderNo},'%')))
             </if>
             <if test="orderID != null and orderID != ''">
-                AND (cr.orderID = #{orderID} OR (crr.relationType = '1' AND cso_cr.orderID = #{orderID}))
+                AND (cr.orderID = #{orderID} )
+            </if>
+            <if test="shopOrderId != null and shopOrderId != ''">
+                AND (cso.shopOrderId = #{shopOrderId} )
             </if>
             <if test="userName != null and userName != ''">
                 AND (u.userName LIKE concat('%',#{userName},'%') or u.name LIKE concat('%',#{userName},'%'))
@@ -196,25 +190,136 @@
             </if>
             <if test="paYee !=null and paYee != ''">
                 <if test="paYee == '采美'">
-                   and a.payWay = 3
+                    and a.payWay = 3
                     OR a.payWay = 2
                     AND a.newReceiptType != 3 AND a.payWay = 2
                 </if>
-            <if test="payWay==1">
-               and s.name=#{paYee}
+                <if test="payWay==1">
+                    and s.name=#{paYee}
+                </if>
+
             </if>
+            and a.delFlag = '0'
+        </where>
+      )
+        union
+        (
+        SELECT
+        <include refid="cmDiscernReceiptColumns"/>,
+        cso.orderId AS orderID,
+        cso.shopOrderNo as shopOrderNo,
+        cso.shopOrderId as shopOrderId,
+        cof.bankAccount AS bankNameType,
+        s.checkMan,
+        s.name AS shopName,
+        u.userName AS "userName",
+        u.name AS "name",
+        IF(crr.relationType = '6',(SELECT NAME FROM USER mu WHERE mu.userId=ccb.userId),'') AS "backname",
+        cr.organizeID AS organizeID
+        FROM cm_discern_receipt a
 
+        LEFT JOIN cm_receipt_order_relation crr ON crr.receiptId = a.id AND crr.delFlag = '0'
+        LEFT JOIN cm_coupon_buyrecord ccb ON crr.couponRecordId=ccb.id
+        LEFT JOIN cm_order cr ON cr.orderId = crr.orderId
+        LEFT JOIN cm_shop_order cso ON cso.shopOrderId = cr.orderId
+        LEFT JOIN shop s ON s.shopID = cso.shopID
+        left join user u on u.userID = cr.userID
+        LEFT JOIN club c ON cr.userId = c.userId
+        LEFT JOIN cm_offline_collection cof ON a.payType = cof.type
+        <where>
+            crr.relationType = 1
+            <if test="id != null and id != '' and id != 0 ">
+                AND a.id = #{id}
+            </if>
+            <if test="organizeID != null and organizeID != 9999 ">
+                AND cr.organizeID = #{organizeID}
+            </if>
+            <if test="organizeID == 9999 ">
+                AND cr.orderType = 2
+            </if>
+            <if test="startTime != null and startTime != ''">
+                AND (a.receiptDate &gt; #{startTime} OR a.receiptDate = #{startTime})
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND (a.receiptDate &lt; #{endTime} OR a.receiptDate = #{endTime})
             </if>
-            and a.delFlag = '0' group by a.id
+            <if test="payWay != null and payWay != ''">
+                AND a.payWay = #{payWay}
+            </if>
+            <if test="payType != null and payType != ''">
+                AND a.payType = #{payType}
+            </if>
+            <if test="receiptType != null and receiptType != ''">
+                <if test="receiptType==2 and newReceiptType==3">
+                    and (a.receiptType = 9)
+                    or a.receiptType = #{receiptType}
+                </if>
+                <if test="receiptType!=2">
+                    AND a.receiptType = #{receiptType}
+                </if>
+                AND a.receiptType = #{receiptType}
+            </if>
+            <if test="newReceiptType !=null">
+                <if test="newReceiptType==3">
+                    and a.newReceiptType =3
+                </if>
+                <if test="newReceiptType != 3">
+                    and a.newReceiptType=#{newReceiptType}
+                </if>
+            </if>
+
+            <if test="receiptStatus != null and receiptStatus != ''">
+                AND a.receiptStatus = #{receiptStatus}
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                AND ((cr.orderNo like concat('%',#{orderNo},'%')) OR (cso.shopOrderNo like concat('%',#{orderNo},'%')))
+            </if>
+            <if test="orderID != null and orderID != ''">
+                AND (cr.orderID = #{orderID} )
+            </if>
+            <if test="shopOrderId != null and shopOrderId != ''">
+                AND (cso.shopOrderId = #{shopOrderId} )
+            </if>
+            <if test="userName != null and userName != ''">
+                AND (u.userName LIKE concat('%',#{userName},'%') or u.name LIKE concat('%',#{userName},'%'))
+            </if>
+            <if test="receiptProgress != null and receiptProgress != ''">
+                and (case when crr.relationType = '1' then
+                cso_cr.receiptStatus
+                else
+                cr.receiptStatus
+                end) = #{receiptProgress}
+            </if>
+            <if test="receiptOrderType != null and receiptOrderType != ''">
+                and (case when crr.relationType = '1' then
+                cso.orderType
+                else
+                cr.orderType
+                end) = #{receiptOrderType}
+            </if>
+            <if test="associationNum != null and associationNum != ''">
+                <if test="associationNum == 1">
+                    and (select count(1) from cm_receipt_order_relation where receiptID = a.id and delFlag = '0') = 1
+                </if>
+                <if test="associationNum == 2">
+                    and (select count(1) from cm_receipt_order_relation where receiptID = a.id and delFlag = '0')
+                    <![CDATA[ > ]]> 1
+                </if>
+            </if>
+            <if test="paYee !=null and paYee != ''">
+                <if test="paYee == '采美'">
+                    and a.payWay = 3
+                    OR a.payWay = 2
+                    AND a.newReceiptType != 3 AND a.payWay = 2
+                </if>
+                <if test="payWay==1">
+                    and s.name=#{paYee}
+                </if>
+
+            </if>
+            and a.delFlag = '0'
         </where>
-        <choose>
-            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
-                ORDER BY ${page.orderBy}
-            </when>
-            <otherwise>
-                order by a.receiptDate desc
-            </otherwise>
-        </choose>
+     )
     </select>
 
     <select id="findAllList" resultType="CmDiscernReceipt">
@@ -644,7 +749,8 @@
 			 and cdr.receiptStatus = '2'
 			) AS receiptAmount,
 			bou.name AS customerName,
-			co.receiptStatus AS receiptStatus,
+            cso.orderStatusFlag AS orderStatusFlag,
+            cso.receiptStatus AS receiptStatus,
 			co.orderType AS orderType,
 			co.orderTime AS orderTime,
             co.userID AS userID,

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

@@ -130,6 +130,9 @@
             <if test="shopOrderID != null and shopOrderID != ''">
                 AND a.shopOrderId = #{shopOrderID}
             </if>
+            <if test="shopOrderNo != null and shopOrderNo != ''">
+                AND cso.shopOrderNo = #{shopOrderNo}
+            </if>
             <if test="userID != null and userID != ''">
                 AND a.userID = #{userID}
             </if>

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

@@ -29,13 +29,15 @@
 			b.totalFee as totalFee,b.totalAddedValueTax as totalAddedValueTax,
 			b.taxRate as taxRate,b.addedValueTax as addedValueTax,c.mainImage as mainImage,
 			c.name as name,d.name as shopName,
-			cs.unit as unit
+			cs.unit as unit,
+			cs.organizeId as organizeId
 		FROM cm_returned_purchase_product a
 		left join cm_order_product b on a.orderProductID = b.orderProductID
 		left join cm_sku cs on b.skuId = cs.skuId
 		left join product c on c.productID = a.productID
 		left join shop d on d.shopID = a.shopID
 		<where>
+			  c.groundMall like CONCAT('%', cs.organizeId, '%')
             <if test="returnedID != null and returnedID != ''">
                 AND a.returnedID = #{returnedID}
             </if>

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

@@ -83,6 +83,7 @@
 		cs.stock AS stock,
 		cs.costCheckFlag AS costCheckFlag,
 		cs.costPrice AS costPrice,
+		cs.organizeId AS organizeId,
 		cs.unit AS unit,
 		a.costPrice as newCostPrice,
 		p.aliasName AS aliasName,
@@ -99,7 +100,7 @@
 
     <sql id="orderProductJoins">
         left join cm_sku cs on cs.skuId = a.skuId
-		LEFT JOIN product p ON p.productID = a.productID
+		LEFT JOIN product p ON p.productID = a.productID  and  p.groundMall like CONCAT('%', cs.organizeId, '%')
     </sql>
 
     <select id="get" resultType="NewOrderProduct">
@@ -545,6 +546,7 @@
                cop.addedValueTax           AS addedValueTax,
                cop.productType             AS productType,
                cop.totalAddedValueTax      AS totalAddedValueTax,
+               cs.organizeId      AS organizeId,
                cpo.touchPrice              AS touchPrice
         from cm_order_product cop
                  left join cm_sku cs on cop.skuId = cs.skuId
@@ -552,7 +554,7 @@
                  left join product p on p.productID = cop.productID
                  left join cm_order co on co.orderID = cop.orderID
                  left join user u on u.userID = co.userID
-        where cop.shopOrderID = #{shopOrderID}
+        where cop.shopOrderID = #{shopOrderID}   and  p.groundMall like CONCAT('%', cs.organizeId, '%')
     </select>
 
     <select id="CountReturnedPurchaseProduct" resultType="java.lang.Integer">

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

@@ -7,6 +7,8 @@
         co.couponAmount as couponAmount,
 			co.userBeans as userBeans,
 			a.shopOrderID AS shopOrderID,
+			a.shopStatus AS status,
+			a.shopPostFlag AS shopPostFlag,
 			a.orderID AS orderID,
 			a.organizeID AS organizeID,
 			a.shopOrderNo AS  shopOrderNo,

src/main/resources/mappings/modules/product/CmOrganizeProductInfoMapper.xml

@@ -0,0 +1,81 @@
+<?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.product.dao.CmOrganizeProductInfoMapper">
+
+    <resultMap type="com.caimei.modules.product.entity.CmOrganizeProductInfo" id="CmOrganizeProductInfoResult">
+        <result property="organizeId"    column="organizeId"    />
+        <result property="productId"    column="productId"    />
+        <result property="validFlag"    column="validFlag"    />
+    </resultMap>
+
+    <sql id="selectCmOrganizeProductInfoVo">
+        select cm_organize_product_info.organizeId,cm_organize_product_info.productId,cm_organize_product_info.validFlag
+    </sql>
+
+    <select id="getByCmOrganizeProductInfo" parameterType="com.caimei.modules.product.entity.CmOrganizeProductInfo" resultMap="CmOrganizeProductInfoResult">
+        <include refid="selectCmOrganizeProductInfoVo"/>
+        from cm_organize_product_info AS cm_organize_product_info
+        <where>
+            <if test="organizeId != null "> and cm_organize_product_info.organizeId = #{organizeId}</if>
+            <if test="productId != null "> and cm_organize_product_info.productId = #{productId}</if>
+            <if test="validFlag != null "> and cm_organize_product_info.validFlag = #{validFlag}</if>
+        </where>
+        limit 0,1
+    </select>
+
+    <select id="getCmOrganizeProductInfoList" parameterType="com.caimei.modules.product.entity.CmOrganizeProductInfo" resultMap="CmOrganizeProductInfoResult">
+        <include refid="selectCmOrganizeProductInfoVo"/>
+        from cm_organize_product_info AS cm_organize_product_info
+        <where>
+            <if test="organizeId != null "> and cm_organize_product_info.organizeId = #{organizeId}</if>
+            <if test="productId != null "> and cm_organize_product_info.productId = #{productId}</if>
+            <if test="validFlag != null "> and cm_organize_product_info.validFlag = #{validFlag}</if>
+        </where>
+    </select>
+
+
+
+    <insert id="addCmOrganizeProductInfo" parameterType="com.caimei.modules.product.entity.CmOrganizeProductInfo">
+        insert into cm_organize_product_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="organizeId != null">organizeId,</if>
+            <if test="productId != null">productId,</if>
+            <if test="validFlag != null">validFlag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="organizeId != null">#{organizeId},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="validFlag != null">#{validFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateCmOrganizeProductInfo" parameterType="com.caimei.modules.product.entity.CmOrganizeProductInfo">
+        update cm_organize_product_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="validFlag != null">validFlag = #{validFlag},</if>
+        </trim>
+        where productId = #{productId}
+        <if test="organizeId != null"> and organizeId = #{organizeId}</if>
+    </update>
+
+    <delete id="delCmOrganizeProductInfoByOrganizeId" parameterType="Integer">
+        delete
+        from cm_organize_product_info where  productId = #{productId} and organizeId = #{organizeId}
+    </delete>
+
+    <delete id="delCmOrganizeProductInfoByOrganizeIds" parameterType="String">
+        delete from cm_organize_product_info where  productId = #{productId} and organizeId in
+        <foreach item="organizeId" collection="organizeIds" open="(" separator="," close=")">
+            #{organizeId}
+        </foreach>
+    </delete>
+    <delete id="delNotCmOrganizeProductInfoByOrganizeIds" parameterType="String">
+        delete from cm_organize_product_info where  productId = #{productId} and  organizeId not in
+        <foreach item="organizeId" collection="organizeIds" open="(" separator="," close=")">
+            #{organizeId}
+        </foreach>
+    </delete>
+
+</mapper>

src/main/resources/mappings/modules/product/CmProductCombinationMapper.xml

@@ -126,8 +126,10 @@
 	<select id="findProductList" resultType="com.caimei.modules.product.entity.Product">
 		SELECT a.*,s.name as "shopName"
 		FROM product a
+		left join cm_organize_product_info copi on copi.productId = a.productID
 		left join shop s on a.shopId = s.shopID
 		<where>
+			a.groundMall like CONCAT('%', copi.organizeId, '%')
 			<if test="productID !=null and productID !=''">
 				AND a.productID=#{productID}
 			</if>
@@ -143,7 +145,8 @@
 				<if test="dbName == 'mssql'">'%'+#{shopName}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{shopName},'%')</if>
 			</if>
-			AND a.validFlag in (2,3,9)
+-- 			AND a.validFlag in (2,3,9)
+			AND copi.validFlag in (2,3,9)
 			and a.combinationID is null
 			and a.productCategory = 1
 		</where>

src/main/resources/mappings/modules/product/CmPromotionMapper.xml

@@ -112,6 +112,7 @@
     <select id="findGiftProduct" resultType="com.caimei.modules.product.entity.Product">
         SELECT cpg.skuId  AS "skuId",
                cs.unit,
+               cs.organizeId,
                p.name,
                p.mainImage,
                p.productID,
@@ -122,7 +123,7 @@
                  left join cm_sku cs on cpg.skuId = cs.skuId
                  LEFT JOIN product p ON cpg.productId = p.productID
                  LEFT JOIN shop s ON s.shopID = p.shopID
-        WHERE cp.id = #{id}
+        WHERE cp.id = #{id} and p.groundMall like CONCAT('%', cs.organizeId, '%')
           and p.productCategory = 1
     </select>
 
@@ -137,6 +138,7 @@
                p.mainImage         image,
                cs.costCheckFlag    costCheckFlag,
                cs.costPrice        costPrice,
+               cs.organizeId        organizeId,
                cs.shopPercent shopPercent,
                cs.normalPrice AS   normalPrice,
                cpg.number     AS   num,
@@ -146,7 +148,7 @@
                  left join cm_sku cs on cpg.skuId = cs.skuId
                  LEFT JOIN product p ON cpg.productId = p.productID
                  LEFT JOIN shop s ON s.shopID = p.shopID
-        WHERE cp.id = #{id}
+        WHERE cp.id = #{id} and p.groundMall like CONCAT('%', cs.organizeId, '%')
           and p.productCategory = 1
     </select>
 
@@ -165,12 +167,12 @@
         s.name AS shopName
         FROM
         product p
-        left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
+        left join cm_organize_product_info copi on copi.productId = p.productID
         LEFT JOIN shop s ON s.shopID = p.shopID
         <where>
             p.productCategory = 1
             and copi.validFlag = 2
-            and p.priceFlag != 1
+            and p.priceFlag != 1 and p.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="productID != null">
                 AND p.productID = #{productID}
             </if>
@@ -369,7 +371,8 @@
                prp.supplierId,
                pr.discount,
                cpg.skuId,
-               cs.unit
+               cs.unit,
+               cs.organizeId
         from cm_promotions pr
                  left join cm_promotions_product prp on pr.id = prp.promotionsId
                  LEFT JOIN cm_promotions_gift cpg ON pr.id = cpg.promotionsId
@@ -451,7 +454,9 @@
     </select>
 
     <select id="getPromotionSkus" resultType="com.caimei.modules.product.entity.CmSku">
-        SELECT DISTINCT cs.unit, cs.costCheckFlag, cs.costPrice, cs.shopPercent, cps.touchPrice, cs.skuId
+        SELECT DISTINCT cs.unit, cs.costCheckFlag, cs.costPrice, cs.shopPercent, cps.touchPrice
+                               , cs.skuId
+                               , cs.organizeId
         FROM cm_promotions cp
                  LEFT JOIN cm_promotions_product cpp ON cp.id = cpp.promotionsId
                  LEFT JOIN cm_sku cs ON cpp.productId = cs.productId
@@ -460,7 +465,8 @@
     </select>
 
     <select id="getPromotionSkusByProduct" resultType="com.caimei.modules.product.entity.CmSku">
-        SELECT cs.unit, cs.costCheckFlag, cs.costPrice, cs.shopPercent, cps.touchPrice, cs.skuId
+        SELECT cs.unit, cs.costCheckFlag, cs.costPrice, cs.shopPercent, cps.touchPrice
+                      , cs.organizeId
         FROM cm_sku cs
                  LEFT JOIN cm_promotion_sku cps ON cs.skuId = cps.skuId
         WHERE cs.productId = #{productIds}

src/main/resources/mappings/modules/product/CmSecondHandDetailMapper.xml

@@ -49,22 +49,25 @@
 		cs.costPrice as "costPrice",
 		cs.costCheckFlag AS "costCheckFlag",
 		cs.shopPercent AS "shopPercent",
+		cs.organizeId AS "organizeId",
 		p.visibility AS "visibility",
 		p.splitCode AS "splitCode"
     </sql>
 
     <sql id="cmSecondHandDetailJoins">
         left join product p on p.productID = a.productID
-		left join cm_sku cs on p.productId=cs.productId
+		left join cm_sku cs on p.productId=cs.productId and p.groundMall like CONCAT('%', cs.organizeId, '%')
     </sql>
 
     <select id="get" resultType="CmSecondHandDetail">
         SELECT
         <include refid="cmSecondHandDetailColumns"/>
+        ,cs.organizeId
         FROM cm_second_hand_detail a
         <include refid="cmSecondHandDetailJoins"/>
-        left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
+        left join cm_organize_product_info copi on copi.productId = a.productID
         WHERE a.productID = #{id}
+        and a.groundMall like CONCAT('%', copi.organizeId, '%')
     </select>
 
     <select id="findList" resultType="CmSecondHandDetail">
@@ -72,9 +75,9 @@
         <include refid="cmSecondHandDetailColumns"/>
         FROM cm_second_hand_detail a
         <include refid="cmSecondHandDetailJoins"/>
-        left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
+        left join cm_organize_product_info copi on copi.productId = a.productID
         <where>
-
+            a.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="productID != null and productID != ''">
                 AND a.productID = #{productID}
             </if>
@@ -93,9 +96,9 @@
         <include refid="cmSecondHandDetailColumns"/>
         FROM cm_second_hand_detail a
         <include refid="cmSecondHandDetailJoins"/>
-        left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
+        left join cm_organize_product_info copi on copi.productId = p.productID
         <where>
-
+            p.groundMall like CONCAT('%', copi.organizeId, '%')
         </where>
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -15,7 +15,7 @@
 		a.bigTypeID AS "bigTypeID",
 		ifnull(a.smallTypeID,-1)  AS "smallTypeID",
 		ifnull(a.tinyTypeID,-1) AS "tinyTypeID",
-		a.selfTypeID AS "selfTypeID",
+-- 		a.selfTypeID AS "selfTypeID",
 		a.preferredFlag AS "preferredFlag",
 		a.shopID AS "shopID",
 		a.name AS "name",
@@ -30,28 +30,28 @@
 		a.addTime AS "addTime",
 		a.updateTime AS "updateTime",
 		a.sellNumber AS "sellNumber",
-		a.weekSellNumber AS "weekSellNumber",
-		a.beforeValidFlag AS "beforeValidFlag",
-		a.validFlag AS "validFlag",
+-- 		a.weekSellNumber AS "weekSellNumber",
+-- 		a.beforeValidFlag AS "beforeValidFlag",
+		copi.validFlag AS "validFlag",
 		a.favoriteTimes AS "favoriteTimes",
 		a.commentScore AS "commentScore",
 		a.commentTimes AS "commentTimes",
-		a.selfRecommendFlag AS "selfRecommendFlag",
-		a.sysRecommendFlag AS "sysRecommendFlag",
+-- 		a.selfRecommendFlag AS "selfRecommendFlag",
+-- 		a.sysRecommendFlag AS "sysRecommendFlag",
 		a.sortIndex AS "sortIndex",
 		a.featuredFlag AS "featuredFlag",
 		a.featuredSortIndex AS "featuredSortIndex",
 		a.productCode AS "productCode",
-		a.synToERPFlag AS "synToERPFlag",
+-- 		a.synToERPFlag AS "synToERPFlag",
 		a.allAreaFlag AS "allAreaFlag",
 		a.provinceIDs AS "provinceIDs",
 		a.serviceNumber AS "serviceNumber",
 		a.packageCount AS "packageCount",
 		a.byFlag AS "byFlag",
 		a.normalProductFlag AS "normalProductFlag",
-		a.wholeSaleProductFlag AS "wholeSaleProductFlag",
-		a.promotionProductFlag AS "promotionProductFlag",
-		a.groupBuyProductFlag AS "groupBuyProductFlag",
+-- 		a.wholeSaleProductFlag AS "wholeSaleProductFlag",
+-- 		a.promotionProductFlag AS "promotionProductFlag",
+-- 		a.groupBuyProductFlag AS "groupBuyProductFlag",
 		a.step AS "step",
 		a.actStatus AS "actStatus",
 		a.actFlag AS "actFlag",
@@ -59,7 +59,7 @@
 		a.onlineTime AS "onlineTime",
 		a.downlineTime AS "downlineTime",
 		a.freePostFlag AS "freePostFlag",
-		a.precisehKey AS "precisehKey",
+-- 		a.precisehKey AS "precisehKey",
 		s.name AS "shopName",
 		a.actSort AS "actSort",
 		a.recommendType AS "recommendType",
@@ -94,6 +94,7 @@
     <sql id="productJoins">
         LEFT JOIN shop s on s.shopID = a.shopID
 		left join product p on a.productID = p.productId
+        left join cm_organize_product_info copi on copi.productId = a.productID
     </sql>
     <sql id="ActivityJoins">
         LEFT JOIN shop s on s.shopID = a.shopID
@@ -125,13 +126,14 @@
         FROM product a
         <include refid="productJoins"/>
         WHERE a.productID = #{id}
+        and a.groundMall like CONCAT('%', copi.organizeId, '%')
     </select>
 
 
     <select id="getAllExistsProductList" resultType="Integer">
         SELECT p.productID
         FROM product p
-        left join cm_organize_product_info copi on copi.productId = p.productID
+                 left join cm_organize_product_info copi on copi.productId = p.productID
         WHERE
           and copi.organizeID = #{organizeID}
     </select>
@@ -142,6 +144,7 @@
         FROM product a
         <include refid="productJoins"/>
         <where>
+            a.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="productID !=null and productID !=''">
                 AND a.productID=#{productID}
             </if>
@@ -164,7 +167,7 @@
                 <if test="dbName == 'mysql'">concat('%',#{shopName},'%')</if>
             </if>
             <if test="validFlag !=null and validFlag !=''">
-                AND a.validFlag=#{validFlag}
+                AND copi.validFlag=#{validFlag}
             </if>
             <if test="actFlag !=null and actFlag !=''">
                 AND a.actFlag=#{actFlag}
@@ -192,7 +195,7 @@
                     AND a.actType != 3
                 </otherwise>
             </choose>
-            AND a.validFlag != 0
+            AND copi.validFlag != 0
             AND a.shopID not in (SELECT s.`value` FROM `sys_dict` s WHERE s.type='heheShopID')
             and a.productCategory = 1
         </where>
@@ -201,7 +204,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                order by case WHEN a.validFlag = 1 then 0 else 1 END asc,a.productID desc
+                order by case WHEN copi.validFlag = 1 then 0 else 1 END asc,a.productID desc
             </otherwise>
         </choose>
     </select>
@@ -213,9 +216,13 @@
         FROM product a
         <include refid="productJoins"/>
         <where>
+            a.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="productID !=null and productID !=''">
                 AND a.productID=#{productID}
             </if>
+            <if test="groundMall !=null and groundMall !=''">
+                AND a.groundMall=concat('%',#{groundMall},'%')
+            </if>
             <if test="name != null and name != ''">
                 AND a.name LIKE
                 <if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
@@ -228,9 +235,10 @@
                 <if test="dbName == 'mssql'">'%'+#{shopName}+'%'</if>
                 <if test="dbName == 'mysql'">concat('%',#{shopName},'%')</if>
             </if>
-            AND a.validFlag in (2,3,9)
+            AND copi.validFlag in (2,3,9)
             and a.productCategory = 1
         </where>
+        group by a.productID
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
                 ORDER BY ${page.orderBy}
@@ -247,6 +255,7 @@
         FROM product a
         <include refid="productJoins"/>
         <where>
+            a.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="id !=null and id !=''">
                 AND a.productID=#{id}
             </if>
@@ -280,7 +289,7 @@
                 <if test="dbName == 'mysql'">concat('%',#{shopName},'%')</if>
             </if>
             <if test="validFlag !=null and validFlag !=''">
-                AND a.validFlag=#{validFlag}
+                AND copi.validFlag=#{validFlag}
             </if>
             <if test="actFlag !=null and actFlag !=''">
                 AND a.actFlag=#{actFlag}
@@ -303,16 +312,17 @@
             <if test="sqlMap !=null and sqlMap !=''">
                 ${sqlMap.dsf}
             </if>
-            AND a.validFlag != 0
+            AND copi.validFlag != 0
             AND a.shopID not in (SELECT s.`value` FROM `sys_dict` s WHERE s.type='heheShopID')
             and a.productCategory = 1
         </where>
+        group by a.productID
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                order by case WHEN a.validFlag = 1 then 0 else 1 END asc,a.productID desc
+                order by case WHEN copi.validFlag = 1 then 0 else 1 END asc,a.productID desc
             </otherwise>
         </choose>
     </select>
@@ -324,7 +334,9 @@
         <include refid="productJoins"/>
         <where>
             a.productCategory = 1
+            and a.groundMall like CONCAT('%', copi.organizeId, '%')
         </where>
+        group by a.productID
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
                 ORDER BY ${page.orderBy}
@@ -341,7 +353,7 @@
         bigTypeID,
         smallTypeID,
         tinyTypeID,
-        selfTypeID,
+--         selfTypeID,
         shopID,
         aliasName,
         name,
@@ -353,28 +365,28 @@
         propertiesInfo,
         addTime,
         updateTime,
-        weekSellNumber,
-        beforeValidFlag,
+--         weekSellNumber,
+--         beforeValidFlag,
         validFlag,
         favoriteTimes,
         commentScore,
         commentTimes,
-        selfRecommendFlag,
-        sysRecommendFlag,
+--         selfRecommendFlag,
+--         sysRecommendFlag,
         sortIndex,
         featuredFlag,
         featuredSortIndex,
         productCode,
-        synToERPFlag,
+--         synToERPFlag,
         allAreaFlag,
         provinceIDs,
         serviceNumber,
         packageCount,
         byFlag,
         normalProductFlag,
-        wholeSaleProductFlag,
-        promotionProductFlag,
-        groupBuyProductFlag,
+--         wholeSaleProductFlag,
+--         promotionProductFlag,
+--         groupBuyProductFlag,
         step,
         actFlag,
         actType,
@@ -382,7 +394,7 @@
         onlineTime,
         downlineTime,
         freePostFlag,
-        precisehKey,
+--         precisehKey,
         visibility,
         commodityDetailsFlag,
         productType,
@@ -421,7 +433,7 @@
         #{bigTypeID},
         #{smallTypeID},
         #{tinyTypeID},
-        #{selfTypeID},
+--         #{selfTypeID},
         #{shopID},
         #{aliasName},
         #{name},
@@ -433,28 +445,28 @@
         #{propertiesInfo},
         #{addTime},
         #{updateTime},
-        #{weekSellNumber},
-        #{beforeValidFlag},
+--         #{weekSellNumber},
+--         #{beforeValidFlag},
         #{validFlag},
         #{favoriteTimes},
         #{commentScore},
         #{commentTimes},
-        #{selfRecommendFlag},
-        #{sysRecommendFlag},
+--         #{selfRecommendFlag},
+--         #{sysRecommendFlag},
         #{sortIndex},
         #{featuredFlag},
         #{featuredSortIndex},
         #{productCode},
-        #{synToERPFlag},
+--         #{synToERPFlag},
         #{allAreaFlag},
         #{provinceIDs},
         #{serviceNumber},
         #{packageCount},
         #{byFlag},
         #{normalProductFlag},
-        #{wholeSaleProductFlag},
-        #{promotionProductFlag},
-        #{groupBuyProductFlag},
+--         #{wholeSaleProductFlag},
+--         #{promotionProductFlag},
+--         #{groupBuyProductFlag},
         #{step},
         #{actFlag},
         #{actType},
@@ -462,7 +474,7 @@
         #{onlineTime},
         #{downlineTime},
         #{freePostFlag},
-        #{precisehKey},
+--         #{precisehKey},
         #{visibility},
         #{commodityDetailsFlag},
         #{productType},
@@ -503,7 +515,7 @@
         SET productID            = #{id},
             brandID              = #{brandID},
             tinyTypeID           = #{tinyTypeID},
-            selfTypeID           = #{selfTypeID},
+--             selfTypeID           = #{selfTypeID},
             shopID               = #{shopID},
             name                 = #{name},
             searchKey            = #{searchKey},
@@ -515,35 +527,35 @@
             addTime              = #{addTime},
             updateTime           = #{updateTime},
             sellNumber           = #{sellNumber},
-            weekSellNumber       = #{weekSellNumber},
-            beforeValidFlag      = #{beforeValidFlag},
+--             weekSellNumber       = #{weekSellNumber},
+--             beforeValidFlag      = #{beforeValidFlag},
             validFlag            = #{validFlag},
             favoriteTimes        = #{favoriteTimes},
             commentScore         = #{commentScore},
             commentTimes         = #{commentTimes},
-            selfRecommendFlag    = #{selfRecommendFlag},
-            sysRecommendFlag     = #{sysRecommendFlag},
+--             selfRecommendFlag    = #{selfRecommendFlag},
+--             sysRecommendFlag     = #{sysRecommendFlag},
             sortIndex            = #{sortIndex},
             featuredFlag         = #{featuredFlag},
             featuredSortIndex    = #{featuredSortIndex},
             productCode          = #{productCode},
-            synToERPFlag         = #{synToERPFlag},
+--             synToERPFlag         = #{synToERPFlag},
             allAreaFlag          = #{allAreaFlag},
             provinceIDs          = #{provinceIDs},
             serviceNumber        = #{serviceNumber},
             packageCount         = #{packageCount},
             byFlag               = #{byFlag},
             normalProductFlag    = #{normalProductFlag},
-            wholeSaleProductFlag = #{wholeSaleProductFlag},
-            promotionProductFlag = #{promotionProductFlag},
-            groupBuyProductFlag  = #{groupBuyProductFlag},
+--             wholeSaleProductFlag = #{wholeSaleProductFlag},
+--             promotionProductFlag = #{promotionProductFlag},
+--             groupBuyProductFlag  = #{groupBuyProductFlag},
             step                 = #{step},
             actFlag              = #{actFlag},
             actType              = #{actType},
             onlineTime           = #{onlineTime},
             downlineTime         = #{downlineTime},
             freePostFlag         = #{freePostFlag},
-            precisehKey          = #{precisehKey},
+--             precisehKey          = #{precisehKey},
             actSort              = #{actSort},
             newProductType=#{newProductType}
 
@@ -565,8 +577,8 @@
         <include refid="productColumns"/>
         FROM product a
         <include refid="productJoins"/>
-        left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
         <where>
+            a.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="productID !=null">
                 AND a.productID=#{productID}
             </if>
@@ -874,7 +886,7 @@
             `productCategory`,
         </if>
         `preferredFlag`,
-        `selfTypeID`,
+--         `selfTypeID`,
         `shopID`,
         `name`,
         `aliasName`,
@@ -887,28 +899,28 @@
         `propertiesInfo`,
         `addTime`,
         `updateTime`,
-        `weekSellNumber`,
-        `beforeValidFlag`,
+--         `weekSellNumber`,
+--         `beforeValidFlag`,
         `validFlag`,
         `favoriteTimes`,
         `commentScore`,
         `commentTimes`,
-        `selfRecommendFlag`,
-        `sysRecommendFlag`,
+--         `selfRecommendFlag`,
+--         `sysRecommendFlag`,
         `sortIndex`,
         `featuredFlag`,
         `featuredSortIndex`,
         `productCode`,
-        `synToERPFlag`,
+--         `synToERPFlag`,
         `allAreaFlag`,
         `provinceIDs`,
         `serviceNumber`,
         `packageCount`,
         `byFlag`,
         `normalProductFlag`,
-        `wholeSaleProductFlag`,
-        `promotionProductFlag`,
-        `groupBuyProductFlag`,
+--         `wholeSaleProductFlag`,
+--         `promotionProductFlag`,
+--         `groupBuyProductFlag`,
         `step`,
         `actFlag`,
         `actStatus`,
@@ -918,7 +930,7 @@
         `onlineTime`,
         `downlineTime`,
         `freePostFlag`,
-        `precisehKey`,
+--         `precisehKey`,
         `tags`,
         `productType`,
         `machineType`,
@@ -939,7 +951,7 @@
             #{productCategory},
         </if>
         #{preferredFlag},
-        #{selfTypeID},
+--         #{selfTypeID},
         #{shopID},
         #{name},
         #{aliasName},
@@ -952,28 +964,28 @@
         #{propertiesInfo},
         #{addTime},
         #{updateTime},
-        #{weekSellNumber},
-        #{beforeValidFlag},
+--         #{weekSellNumber},
+--         #{beforeValidFlag},
         #{validFlag},
         #{favoriteTimes},
         #{commentScore},
         #{commentTimes},
-        #{selfRecommendFlag},
-        #{sysRecommendFlag},
+--         #{selfRecommendFlag},
+--         #{sysRecommendFlag},
         #{sortIndex},
         #{featuredFlag},
         #{featuredSortIndex},
         #{productCode},
-        #{synToERPFlag},
+--         #{synToERPFlag},
         #{allAreaFlag},
         #{provinceIDs},
         #{serviceNumber},
         #{packageCount},
         #{byFlag},
         #{normalProductFlag},
-        #{wholeSaleProductFlag},
-        #{promotionProductFlag},
-        #{groupBuyProductFlag},
+--         #{wholeSaleProductFlag},
+--         #{promotionProductFlag},
+--         #{groupBuyProductFlag},
         #{step},
         #{actFlag},
         #{actStatus},
@@ -983,7 +995,7 @@
         #{onlineTime},
         #{downlineTime},
         #{freePostFlag},
-        #{precisehKey},
+--         #{precisehKey},
         #{tags},
         #{productType},
         #{machineType},
@@ -1042,6 +1054,7 @@
          shopPercent,
          organizePercent,
          cmPercent,
+         organizeId,
          minBuyNumber,
          unit)
         values (#{productId},
@@ -1054,6 +1067,7 @@
                 #{shopPercent},
                 #{organizePercent},
                 #{cmPercent},
+                #{organizeId},
                 #{minBuyNumber},
                 #{unit})
     </insert>
@@ -1099,15 +1113,17 @@
         FROM
         cm_search_recommend_product csrp
         LEFT JOIN product a on a.productID = csrp.productID
+        left join cm_organize_product_info copi on copi.productId = a.productID
         LEFT JOIN shop s on s.shopID = a.shopID
         left join cm_brand b on b.id = a.brandID
         WHERE
         csrp.tinyTypeId = #{tinyTypeID}
+        and a.groundMall like CONCAT('%', copi.organizeId, '%')
         <if test="name != null and name != ''">
             AND a.name like concat('%', #{name} ,'%')
         </if>
         <if test="validFlag !=null and validFlag !=''">
-            AND a.validFlag=#{validFlag}
+            AND copi.validFlag=#{validFlag}
         </if>
         <if test="shopName != null and shopName != ''">
             AND s.name like concat('%', #{shopName} ,'%')
@@ -1116,7 +1132,7 @@
             AND b.name like concat('%', #{brandName} ,'%')
         </if>
         and a.productCategory = 1
-        AND a.validFlag != 0
+        AND copi.validFlag != 0
         AND csrp.delFlag =0
         ORDER BY csrp.sort DESC
     </select>
@@ -1178,12 +1194,13 @@
         b.name AS brandName,
         s.name AS shopName
         FROM product a
+        left join cm_organize_product_info copi on copi.productId = a.productID
         LEFT JOIN shop s on s.shopID = a.shopID
         left join cm_brand b on b.id = a.brandID
         WHERE
         NOT EXISTS (select * from cm_search_recommend_product csrp where csrp.productID = a.productID and
         csrp.tinyTypeID = #{tinyTypeID} AND csrp.delFlag = 0)
-        and a.validFlag = '2'
+        and copi.validFlag = '2' and p.groundMall like CONCAT('%', copi.organizeId, '%')
         <if test="name != null and name != ''">
             and a.name like concat('%', #{name} ,'%')
         </if>
@@ -1200,8 +1217,10 @@
         SELECT
         <include refid="productColumns"/>
         FROM product a
+        left join cm_organize_product_info copi on copi.productId = a.productID
         <include refid="ActivityJoins"/>
         <where>
+            a.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="id !=null and id !=''">
                 AND a.productID=#{id}
             </if>
@@ -1242,7 +1261,7 @@
             <if test="sqlMap !=null and sqlMap !=''">
                 ${sqlMap.dsf}
             </if>
-            AND a.validFlag = 2
+            AND copi.validFlag = 2
             AND ((a.actType != 1 AND a.actType != 2 OR a.`actType` IS NULL) or a.actFlag = 0)
             AND a.shopID not in (SELECT s.`value` FROM `sys_dict` s WHERE s.type='heheShopID')
             and a.productCategory = 1
@@ -1252,7 +1271,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                order by case WHEN a.validFlag = 1 then 0 else 1 END asc,a.productID desc
+                order by case WHEN copi.validFlag = 1 then 0 else 1 END asc,a.productID desc
             </otherwise>
         </choose>
     </select>
@@ -1456,15 +1475,15 @@
             <if test="updateTime != null and updateTime !=''">
                 updateTime = #{updateTime},
             </if>
-            <if test="weekSellNumber != null and weekSellNumber !=''">
-                weekSellNumber = #{weekSellNumber},
-            </if>
-            <if test="beforeValidFlag != null and beforeValidFlag !=''">
-                beforeValidFlag = #{beforeValidFlag},
-            </if>
-            <if test="validFlag != null and validFlag !=''">
-                validFlag = #{validFlag},
-            </if>
+<!--            <if test="weekSellNumber != null and weekSellNumber !=''">-->
+<!--                weekSellNumber = #{weekSellNumber},-->
+<!--            </if>-->
+<!--            <if test="beforeValidFlag != null and beforeValidFlag !=''">-->
+<!--                beforeValidFlag = #{beforeValidFlag},-->
+<!--            </if>-->
+<!--            <if test="validFlag != null and validFlag !=''">-->
+<!--                validFlag = #{validFlag},-->
+<!--            </if>-->
             <if test="favoriteTimes != null and favoriteTimes !=''">
                 favoriteTimes = #{favoriteTimes},
             </if>
@@ -1474,12 +1493,12 @@
             <if test="commentTimes != null and commentTimes !=''">
                 commentTimes = #{commentTimes},
             </if>
-            <if test="selfRecommendFlag != null and selfRecommendFlag !=''">
-                selfRecommendFlag = #{selfRecommendFlag},
-            </if>
-            <if test="sysRecommendFlag != null and sysRecommendFlag !=''">
-                sysRecommendFlag = #{sysRecommendFlag},
-            </if>
+<!--            <if test="selfRecommendFlag != null and selfRecommendFlag !=''">-->
+<!--                selfRecommendFlag = #{selfRecommendFlag},-->
+<!--            </if>-->
+<!--            <if test="sysRecommendFlag != null and sysRecommendFlag !=''">-->
+<!--                sysRecommendFlag = #{sysRecommendFlag},-->
+<!--            </if>-->
             <if test="sortIndex != null and sortIndex != ''">
                 sortIndex = #{sortIndex},
             </if>
@@ -1492,9 +1511,9 @@
             <if test="productCode != null and productCode !=''">
                 productCode = #{productCode},
             </if>
-            <if test="synToERPFlag != null and synToERPFlag !=''">
-                synToERPFlag = #{synToERPFlag},
-            </if>
+<!--            <if test="synToERPFlag != null and synToERPFlag !=''">-->
+<!--                synToERPFlag = #{synToERPFlag},-->
+<!--            </if>-->
             <if test="allAreaFlag != null and allAreaFlag !=''">
                 allAreaFlag = #{allAreaFlag},
             </if>
@@ -1513,15 +1532,15 @@
             <if test="normalProductFlag != null and normalProductFlag !=''">
                 normalProductFlag = #{normalProductFlag},
             </if>
-            <if test="wholeSaleProductFlag != null and wholeSaleProductFlag !=''">
-                wholeSaleProductFlag = #{wholeSaleProductFlag},
-            </if>
-            <if test="promotionProductFlag != null and promotionProductFlag !=''">
-                promotionProductFlag = #{promotionProductFlag},
-            </if>
-            <if test="groupBuyProductFlag != null and groupBuyProductFlag !=''">
-                groupBuyProductFlag = #{groupBuyProductFlag},
-            </if>
+<!--            <if test="wholeSaleProductFlag != null and wholeSaleProductFlag !=''">-->
+<!--                wholeSaleProductFlag = #{wholeSaleProductFlag},-->
+<!--            </if>-->
+<!--            <if test="promotionProductFlag != null and promotionProductFlag !=''">-->
+<!--                promotionProductFlag = #{promotionProductFlag},-->
+<!--            </if>-->
+<!--            <if test="groupBuyProductFlag != null and groupBuyProductFlag !=''">-->
+<!--                groupBuyProductFlag = #{groupBuyProductFlag},-->
+<!--            </if>-->
             <if test="step != null and step !=''">
                 step = #{step},
             </if>
@@ -1543,9 +1562,9 @@
             <if test="freePostFlag != null and freePostFlag !=''">
                 freePostFlag = #{freePostFlag},
             </if>
-            <if test="precisehKey != null and precisehKey !=''">
-                precisehKey = #{precisehKey},
-            </if>
+<!--            <if test="precisehKey != null and precisehKey !=''">-->
+<!--                precisehKey = #{precisehKey},-->
+<!--            </if>-->
             <if test="visibility != null and visibility !=''">
                 visibility = #{visibility},
             </if>
@@ -1682,6 +1701,7 @@
             ladderPriceFlag=#{ladderPriceFlag},
             normalPrice=#{normalPrice},
             price=#{price},
+            organizeId=#{organizeId},
             shopPercent=#{shopPercent},
             organizePercent=#{organizePercent},
             cmPercent=#{cmPercent},
@@ -1745,9 +1765,9 @@
                p.productCategory as "productCategory"
         from product p
                  left join shop s on s.shopID = p.shopID
-                 left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
+                 left join cm_organize_product_info copi on copi.productId = p.productID
         where p.productID = #{productID}
-          AND copi.validFlag = '2'
+          AND copi.validFlag = '2' and  p.groundMall like CONCAT('%', copi.organizeId, '%')
     </select>
 
     <select id="querySecondHandRecommend" resultType="CmSecondHandRecommendVo">
@@ -1759,9 +1779,10 @@
         s.name AS shopName,
         p.productCategory as "productCategory"
         from product p
-        left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
+        left join cm_organize_product_info copi on copi.productId = p.productID
         left join shop s on s.shopID = p.shopID
         <where>
+            p.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="productID != null and productID != ''">
                 p.productID = #{productID}
             </if>
@@ -1810,6 +1831,7 @@
         FROM product a
         <include refid="productJoins"/>
         <where>
+            a.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="id !=null and id !=''">
                 AND a.productID=#{id}
             </if>
@@ -1829,7 +1851,7 @@
                 <if test="dbName == 'mysql'">concat('%',#{shopName},'%')</if>
             </if>
             <if test="validFlag !=null and validFlag !=''">
-                AND a.validFlag=#{validFlag}
+                AND copi.validFlag=#{validFlag}
             </if>
             <if test="actFlag !=null and actFlag !=''">
                 AND a.actFlag=#{actFlag}
@@ -1845,7 +1867,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                order by case WHEN a.validFlag = 1 then 0 else 1 END asc,a.productID desc
+                order by case WHEN copi.validFlag = 1 then 0 else 1 END asc,a.productID desc
             </otherwise>
         </choose>
     </select>
@@ -1853,10 +1875,10 @@
     <select id="findAllProduct" resultType="com.caimei.modules.product.entity.Product">
         select p.productID,p.mainImage,p.name,s.name as shopName
         from product p
-        left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
+        left join cm_organize_product_info copi on copi.productId = p.productID
         left join shop s on p.shopID = s.shopID
         <where>
-            (p.actFlag=0 or p.actType is null) and copi.validFlag = 2 and p.productCategory = 1
+            (p.actFlag=0 or p.actType is null) and copi.validFlag = 2 and p.productCategory = 1 and p.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="productIds != null and productIds != '' ">
                 and p.productID != #{productIds}
             </if>
@@ -1879,6 +1901,7 @@
         FROM product a
         <include refid="productJoins"/>
         <where>
+            a.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="productID !=null">
                 AND a.productID=#{productID}
             </if>
@@ -1892,7 +1915,7 @@
                 AND s.name LIKE concat('%',#{shopName},'%')
             </if>
             <if test="validFlag !=null and validFlag !=''">
-                AND a.validFlag=#{validFlag}
+                AND copi.validFlag=#{validFlag}
             </if>
             <if test="productCategory !=null and productCategory !=''">
                 AND a.productCategory=#{productCategory}
@@ -1941,6 +1964,7 @@
     <select id="findSkuList" resultType="com.caimei.modules.product.entity.CmSku">
         select cs.skuId,
                cs.productId,
+               cs.organizeId,
                unit,
                normalPrice,
                stock,
@@ -1962,6 +1986,7 @@
     <select id="findSkuListProduct" resultType="com.caimei.modules.product.entity.CmSku">
         select cs.skuId,
                cs.productId,
+               cs.organizeId,
                unit,
                normalPrice,
                stock,
@@ -1978,12 +2003,12 @@
                csps.priceType
         from cm_sku cs
                  left join cm_svip_product_sku csps on cs.skuId = csps.skuId
-        where cs.productId = #{productID}
+        where cs.organizeId=0 and  cs.productId = #{productID}
     </select>
     <select id="findSkuOrganizeList" resultType="com.caimei.modules.product.entity.CmSku">
         select skuId,
                productId,
-               mallProductId,
+               organizeId,
                unit,
                normalPrice,
                stock,
@@ -1996,7 +2021,7 @@
                shopPercent,
                cmPercent
         from cm_sku
-        where productId = #{productID}
+        where organizeId=4  and productId = #{productID}
     </select>
     <select id="findLadderPriceBySku" resultType="com.caimei.modules.product.entity.CmLadderPrice">
         select skuId, productId, userType, ladderNum, buyNum, buyPrice, delFlag
@@ -2023,14 +2048,16 @@
         <include refid="productColumns"/>
         ,cs.unit
         ,cs.skuId
+        ,cs.organizeId
         FROM product a
         <include refid="productJoins"/>
-        left join cm_sku cs on cs.productId=a.productID
-        WHERE cs.skuId = #{skuId}
+        left join cm_sku cs on cs.productId=a.productID and copi.organizeId= cs.organizeId
+        WHERE cs.skuId = #{skuId} and a.groundMall like CONCAT('%', copi.organizeId, '%')
     </select>
     <select id="findHeHeSku" resultType="com.caimei.modules.product.entity.CmSku">
         select cs.skuId,
                cs.productId,
+               cs.organizeId,
                cs.unit,
                cs.stock,
                cs.costCheckFlag,
@@ -2054,14 +2081,18 @@
         limit 1
     </select>
     <select id="findOrganizeSku" resultType="com.caimei.modules.product.entity.CmSku">
-        SELECT price, ifnull(costPrice, 0),"1" AS costCheckFlag, shopPercent AS shopPercent, normalPrice
+        SELECT price, ifnull(costPrice, 0),"1" AS costCheckFlag, shopPercent AS shopPercent
+                    , normalPrice
+                    , organizeId
         FROM cm_sku
         WHERE productId = #{productId}
         ORDER BY price ASC
         LIMIT 1
     </select>
     <select id="findSkuById" resultType="com.caimei.modules.product.entity.CmSku">
-        select skuId, price, costPrice, costCheckFlag, shopPercent, unit
+        select skuId, price, costPrice, costCheckFlag, shopPercent
+                    , unit
+                    , organizeId
         from cm_sku
         where skuId = #{skuId}
     </select>
@@ -2076,7 +2107,9 @@
         where skuId = #{skuId}
     </select>
     <select id="findSkuByPromotion" resultType="com.caimei.modules.product.entity.CmSku">
-        SELECT cs.price, cps.skuId, cps.touchPrice, cs.unit
+        SELECT cs.price, cps.skuId, cps.touchPrice
+                       , cs.unit
+                       , cs.organizeId
         FROM cm_promotion_sku cps
                  LEFT JOIN cm_sku cs ON cps.skuId = cs.skuId
         WHERE promotionId = #{id}

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -18,7 +18,6 @@
         ifnull(a.smallTypeID,0)  AS "smallTypeID",
         ifnull(a.tinyTypeID,0) AS "tinyTypeID",
         a.productCategory AS "productCategory",
-        a.selfTypeID AS "selfTypeID",
         a.preferredFlag AS "preferredFlag",
         a.shopID AS "shopID",
         a.name AS "name",
@@ -33,28 +32,27 @@
         a.addTime AS "addTime",
         a.updateTime AS "updateTime",
         a.sellNumber AS "sellNumber",
-        a.weekSellNumber AS "weekSellNumber",
-        a.beforeValidFlag AS "beforeValidFlag",
-        a.validFlag AS "validFlag",
+--         a.beforeValidFlag AS "beforeValidFlag",
+        copi.validFlag AS "validFlag",
         a.favoriteTimes AS "favoriteTimes",
         a.commentScore AS "commentScore",
         a.commentTimes AS "commentTimes",
-        a.selfRecommendFlag AS "selfRecommendFlag",
-        a.sysRecommendFlag AS "sysRecommendFlag",
+--         a.selfRecommendFlag AS "selfRecommendFlag",
+--         a.sysRecommendFlag AS "sysRecommendFlag",
         a.sortIndex AS "sortIndex",
         a.featuredFlag AS "featuredFlag",
         a.featuredSortIndex AS "featuredSortIndex",
         a.productCode AS "productCode",
-        a.synToERPFlag AS "synToERPFlag",
+--         a.synToERPFlag AS "synToERPFlag",
         a.allAreaFlag AS "allAreaFlag",
         a.provinceIDs AS "provinceIDs",
         a.serviceNumber AS "serviceNumber",
         a.packageCount AS "packageCount",
         a.byFlag AS "byFlag",
         a.normalProductFlag AS "normalProductFlag",
-        a.wholeSaleProductFlag AS "wholeSaleProductFlag",
-        a.promotionProductFlag AS "promotionProductFlag",
-        a.groupBuyProductFlag AS "groupBuyProductFlag",
+--         a.wholeSaleProductFlag AS "wholeSaleProductFlag",
+--         a.promotionProductFlag AS "promotionProductFlag",
+--         a.groupBuyProductFlag AS "groupBuyProductFlag",
         a.step AS "step",
         a.actStatus AS "actStatus",
         a.actFlag AS "actFlag",
@@ -62,7 +60,7 @@
         a.onlineTime AS "onlineTime",
         a.downlineTime AS "downlineTime",
         a.freePostFlag AS "freePostFlag",
-        a.precisehKey AS "precisehKey",
+--         a.precisehKey AS "precisehKey",
         s.name AS "shopName",
         a.actSort AS "actSort",
         a.recommendType AS "recommendType",
@@ -109,6 +107,7 @@
     </sql>
 
     <sql id="productJoins">
+        left join cm_organize_product_info copi on copi.productId = a.productID
         LEFT JOIN shop s ON s.shopID = a.shopID
         LEFT JOIN cm_second_hand_detail cshd ON cshd.productID = a.productID
         LEFT JOIN cm_brand cb ON a.brandID = cb.id
@@ -125,7 +124,7 @@
         <include refid="productColumns"/>
         FROM product a
         <include refid="productJoins"/>
-        WHERE a.productID = #{id}
+        WHERE a.productID = #{id} and  copi.organizeId=(SELECT SUBSTRING_INDEX(groundMall, ',', 1)FROM product WHERE productID=#{id})
     </select>
 
     <select id="getProductParams" resultType="com.caimei.modules.product.entity.ProductParameters">
@@ -142,7 +141,7 @@
         FROM product a
         <include refid="productJoins"/>
         <where>
-
+            a.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="id !=null and id !=''">
                 AND a.productID=#{id}
             </if>
@@ -166,19 +165,19 @@
                 <if test="productCategory == 2">
                     # 1待审核 2已上架 3已下架 8 审核不通过
                     <if test="validFlag == 1">
-                        AND a.validFlag = '1'
+                        AND copi.validFlag = '1'
                     </if>
                     <if test="validFlag == 2">
-                        AND a.validFlag = '2'
+                        AND copi.validFlag = '2'
                     </if>
                     <if test="validFlag == 3">
-                        AND a.validFlag = '3'
+                        AND copi.validFlag = '3'
                     </if>
                     <if test="validFlag == 8">
-                        AND a.validFlag = '8'
+                        AND copi.validFlag = '8'
                     </if>
                     <if test="validFlag == null and validFlag == ''">
-                        AND a.validFlag != '0'
+                        AND copi.validFlag != '0'
                     </if>
 
                 </if>
@@ -216,7 +215,7 @@
                 <if test="dbName == 'mysql'">concat('%',#{shopName},'%')</if>
             </if>
             <if test="validFlagString !=null and validFlagString !=''">
-                AND a.validFlag in
+                AND copi.validFlag in
                 <foreach collection="validFlagString" separator="," item="valid" open="(" close=")">
                     #{valid}
                 </foreach>
@@ -269,6 +268,7 @@
             AND a.shopID not in (SELECT s.`value` FROM `sys_dict` s WHERE s.type='heheShopID')
             AND a.productID NOT IN (6060, 6061, 6062, 6063, 6064,6065, 6066, 6067, 6068, 6069)
         </where>
+        group by  a.productID
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
                 ORDER BY ${page.orderBy}
@@ -285,11 +285,12 @@
         FROM product a
         <include refid="productJoins"/>
         <where>
-            a.productCategory = 1
+            a.productCategory = 1 and a.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="productCategory != null and productCategory != ''">
                 AND a.productCategory = #{productCategory}
             </if>
         </where>
+        group by  a.productID
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
                 ORDER BY ${page.orderBy}
@@ -310,9 +311,10 @@
         where productImageID = #{productImageID}
     </select>
     <select id="getValidFlagByProductId" resultType="java.lang.String">
-        select validFlag
-        from product
-        where productID = #{productID}
+        select copi.validFlag
+        from product p
+        left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
+        where p.productID = #{productID}
     </select>
     <select id="getBeforeValidFlagByProductId" resultType="java.lang.String">
         select beforeValidFlag
@@ -325,7 +327,7 @@
                             brandID,
                             tinyTypeID,
                             productCategory,
-                            selfTypeID,
+--                             selfTypeID,
                             shopID,
                             name,
                             searchKey,
@@ -337,41 +339,41 @@
                             addTime,
                             updateTime,
                             sellNumber,
-                            weekSellNumber,
-                            beforeValidFlag,
+--                             weekSellNumber,
+--                             beforeValidFlag,
                             validFlag,
                             favoriteTimes,
                             commentScore,
                             commentTimes,
-                            selfRecommendFlag,
-                            sysRecommendFlag,
+--                             selfRecommendFlag,
+--                             sysRecommendFlag,
                             sortIndex,
                             featuredFlag,
                             featuredSortIndex,
                             productCode,
-                            synToERPFlag,
+--                             synToERPFlag,
                             allAreaFlag,
                             provinceIDs,
                             serviceNumber,
                             packageCount,
                             byFlag,
                             normalProductFlag,
-                            wholeSaleProductFlag,
-                            promotionProductFlag,
-                            groupBuyProductFlag,
+--                             wholeSaleProductFlag,
+--                             promotionProductFlag,
+--                             groupBuyProductFlag,
                             step,
                             actFlag,
                             actType,
                             onlineTime,
                             downlineTime,
                             freePostFlag,
-                            precisehKey,
+--                             precisehKey,
                             returnGoodsStutas)
         VALUES (#{id},
                 #{brandID},
                 #{tinyTypeID},
                 #{productCategory},
-                #{selfTypeID},
+--                 #{selfTypeID},
                 #{shopID},
                 #{name},
                 #{searchKey},
@@ -383,35 +385,35 @@
                 #{addTime},
                 #{updateTime},
                 #{sellNumber},
-                #{weekSellNumber},
-                #{beforeValidFlag},
+--                 #{weekSellNumber},
+--                 #{beforeValidFlag},
                 #{validFlag},
                 #{favoriteTimes},
                 #{commentScore},
                 #{commentTimes},
-                #{selfRecommendFlag},
-                #{sysRecommendFlag},
+--                 #{selfRecommendFlag},
+--                 #{sysRecommendFlag},
                 #{sortIndex},
                 #{featuredFlag},
                 #{featuredSortIndex},
                 #{productCode},
-                #{synToERPFlag},
+--                 #{synToERPFlag},
                 #{allAreaFlag},
                 #{provinceIDs},
                 #{serviceNumber},
                 #{packageCount},
                 #{byFlag},
                 #{normalProductFlag},
-                #{wholeSaleProductFlag},
-                #{promotionProductFlag},
-                #{groupBuyProductFlag},
+--                 #{wholeSaleProductFlag},
+--                 #{promotionProductFlag},
+--                 #{groupBuyProductFlag},
                 #{step},
                 #{actFlag},
                 #{actType},
                 #{onlineTime},
                 #{downlineTime},
                 #{freePostFlag},
-                #{precisehKey},
+--                 #{precisehKey},
                 #{returnGoodsStutas})
     </insert>
     <update id="update">
@@ -420,7 +422,7 @@
             brandID              = #{brandID},
             tinyTypeID           = #{tinyTypeID},
             productCategory      = #{productCategory},
-            selfTypeID           = #{selfTypeID},
+--             selfTypeID           = #{selfTypeID},
             shopID               = #{shopID},
             name                 = #{name},
             searchKey            = #{searchKey},
@@ -432,35 +434,35 @@
             addTime              = #{addTime},
             updateTime           = #{updateTime},
             sellNumber           = #{sellNumber},
-            weekSellNumber       = #{weekSellNumber},
-            beforeValidFlag      = #{beforeValidFlag},
+--             weekSellNumber       = #{weekSellNumber},
+--             beforeValidFlag      = #{beforeValidFlag},
             validFlag            = #{validFlag},
             favoriteTimes        = #{favoriteTimes},
             commentScore         = #{commentScore},
             commentTimes         = #{commentTimes},
-            selfRecommendFlag    = #{selfRecommendFlag},
-            sysRecommendFlag     = #{sysRecommendFlag},
+--             selfRecommendFlag    = #{selfRecommendFlag},
+--             sysRecommendFlag     = #{sysRecommendFlag},
             sortIndex            = #{sortIndex},
             featuredFlag         = #{featuredFlag},
             featuredSortIndex    = #{featuredSortIndex},
             productCode          = #{productCode},
-            synToERPFlag         = #{synToERPFlag},
+--             synToERPFlag         = #{synToERPFlag},
             allAreaFlag          = #{allAreaFlag},
             provinceIDs          = #{provinceIDs},
             serviceNumber        = #{serviceNumber},
             packageCount         = #{packageCount},
             byFlag               = #{byFlag},
             normalProductFlag    = #{normalProductFlag},
-            wholeSaleProductFlag = #{wholeSaleProductFlag},
-            promotionProductFlag = #{promotionProductFlag},
-            groupBuyProductFlag  = #{groupBuyProductFlag},
+--             wholeSaleProductFlag = #{wholeSaleProductFlag},
+--             promotionProductFlag = #{promotionProductFlag},
+--             groupBuyProductFlag  = #{groupBuyProductFlag},
             step                 = #{step},
             actFlag              = #{actFlag},
             actType              = #{actType},
             onlineTime           = #{onlineTime},
             downlineTime         = #{downlineTime},
             freePostFlag         = #{freePostFlag},
-            precisehKey          = #{precisehKey},
+--             precisehKey          = #{precisehKey},
             actSort              = #{actSort},
             productType          = #{productType},
             qualificationImg     = #{qualificationImg},
@@ -504,9 +506,9 @@
             <if test="preferredFlag != null and preferredFlag !=''">
                 preferredFlag = #{preferredFlag},
             </if>
-            <if test="selfTypeID != null and selfTypeID !=''">
-                selfTypeID = #{selfTypeID},
-            </if>
+<!--            <if test="selfTypeID != null and selfTypeID !=''">-->
+<!--                selfTypeID = #{selfTypeID},-->
+<!--            </if>-->
             <if test="shopID != null and shopID !=''">
                 shopID = #{shopID},
             </if>
@@ -561,15 +563,13 @@
             <if test="sellNumber != null and sellNumber !=''">
                 sellNumber = #{sellNumber},
             </if>
-            <if test="weekSellNumber != null and weekSellNumber !=''">
-                weekSellNumber = #{weekSellNumber},
-            </if>
-            <if test="beforeValidFlag != null and beforeValidFlag !=''">
-                beforeValidFlag = #{beforeValidFlag},
-            </if>
-            <if test="validFlag != null and validFlag !=''">
-                validFlag = #{validFlag},
-            </if>
+<!--            <if test="weekSellNumber != null and weekSellNumber !=''">-->
+<!--                weekSellNumber = #{weekSellNumber},-->
+<!--            </if>-->
+<!--            <if test="beforeValidFlag != null and beforeValidFlag !=''">-->
+<!--                beforeValidFlag = #{beforeValidFlag},-->
+<!--            </if>-->
+
             <if test="favoriteTimes != null and favoriteTimes !=''">
                 favoriteTimes = #{favoriteTimes},
             </if>
@@ -579,12 +579,12 @@
             <if test="commentTimes != null and commentTimes !=''">
                 commentTimes = #{commentTimes},
             </if>
-            <if test="selfRecommendFlag != null and selfRecommendFlag !=''">
-                selfRecommendFlag = #{selfRecommendFlag},
-            </if>
-            <if test="sysRecommendFlag != null and sysRecommendFlag !=''">
-                sysRecommendFlag = #{sysRecommendFlag},
-            </if>
+<!--            <if test="selfRecommendFlag != null and selfRecommendFlag !=''">-->
+<!--                selfRecommendFlag = #{selfRecommendFlag},-->
+<!--            </if>-->
+<!--            <if test="sysRecommendFlag != null and sysRecommendFlag !=''">-->
+<!--                sysRecommendFlag = #{sysRecommendFlag},-->
+<!--            </if>-->
             <if test="sortIndex != null and sortIndex != ''">
                 sortIndex = #{sortIndex},
             </if>
@@ -600,9 +600,9 @@
             <if test="unit != null and unit !=''">
                 unit = #{unit},
             </if>
-            <if test="synToERPFlag != null and synToERPFlag !=''">
-                synToERPFlag = #{synToERPFlag},
-            </if>
+<!--            <if test="synToERPFlag != null and synToERPFlag !=''">-->
+<!--                synToERPFlag = #{synToERPFlag},-->
+<!--            </if>-->
             <if test="allAreaFlag != null and allAreaFlag !=''">
                 allAreaFlag = #{allAreaFlag},
             </if>
@@ -627,15 +627,15 @@
             <if test="normalProductFlag != null and normalProductFlag !=''">
                 normalProductFlag = #{normalProductFlag},
             </if>
-            <if test="wholeSaleProductFlag != null and wholeSaleProductFlag !=''">
-                wholeSaleProductFlag = #{wholeSaleProductFlag},
-            </if>
-            <if test="promotionProductFlag != null and promotionProductFlag !=''">
-                promotionProductFlag = #{promotionProductFlag},
-            </if>
-            <if test="groupBuyProductFlag != null and groupBuyProductFlag !=''">
-                groupBuyProductFlag = #{groupBuyProductFlag},
-            </if>
+<!--            <if test="wholeSaleProductFlag != null and wholeSaleProductFlag !=''">-->
+<!--                wholeSaleProductFlag = #{wholeSaleProductFlag},-->
+<!--            </if>-->
+<!--            <if test="promotionProductFlag != null and promotionProductFlag !=''">-->
+<!--                promotionProductFlag = #{promotionProductFlag},-->
+<!--            </if>-->
+<!--            <if test="groupBuyProductFlag != null and groupBuyProductFlag !=''">-->
+<!--                groupBuyProductFlag = #{groupBuyProductFlag},-->
+<!--            </if>-->
             <if test="step != null and step !=''">
                 step = #{step},
             </if>
@@ -666,9 +666,9 @@
             <if test="costCheckFlag != null and costCheckFlag !=''">
                 costCheckFlag = #{costCheckFlag},
             </if>
-            <if test="precisehKey != null and precisehKey !=''">
-                precisehKey = #{precisehKey},
-            </if>
+<!--            <if test="precisehKey != null and precisehKey !=''">-->
+<!--                precisehKey = #{precisehKey},-->
+<!--            </if>-->
             <if test="visibility != null and visibility !=''">
                 visibility = #{visibility},
             </if>
@@ -700,7 +700,7 @@
                 showFlag=4
             </if>
         </set>
-        where productID = #{productID}
+        where productID = #{productID}  LIMIT 1;
     </update>
 
     <update id="updateImageSort">

src/main/resources/mappings/modules/product/RepeatPurchasePriceMapper.xml

@@ -11,12 +11,13 @@
 		a.taxRate AS "taxRate",
 		a.currentPrice AS "currentPrice",
 		a.createTime AS "createTime",
-		a.skuId as "skuId"
+		a.skuId as "skuId",
+		cs.organizeId as "organizeId"
 	</sql>
 
 	<sql id="repeatPurchasePriceJoins">
 		left join cm_sku cs on cs.skuId=a.skuId
-		left join product as b on cs.productId = b.productID
+		left join product as b on cs.productId = b.productID and b.groundMall like CONCAT('%', cs.organizeId, '%')
 		left join user as c on a.userId = c.userId
 	</sql>
 
@@ -95,6 +96,7 @@
 			AND a.delFlag = 0
 			and b.productCategory = 1
 		</where>
+			group by a.id
 			ORDER BY a.createTime DESC
 	</select>
 

src/main/resources/mappings/modules/svip/CmSvipProductMapper.xml

@@ -127,9 +127,10 @@
         SELECT
         a.productId,a.mainImage,a.name,s.name AS "shopName"
         FROM product a
+        left join cm_organize_product_info copi on copi.productId = a.productID
         LEFT JOIN shop s on s.shopID = a.shopID
         <where>
-            a.validFlag = '2' and a.productCategory = '1'
+            copi.validFlag = '2' and a.productCategory = '1' and a.groundMall like CONCAT('%', copi.organizeId, '%')
             and a.productID not in (
             select productId from cm_promotions_product cpp left join
             cm_promotions cp on cpp.promotionsId = cp.id where cp.delFlag != '2')
@@ -178,6 +179,7 @@
     <select id="findSvipSku" resultType="com.caimei.modules.product.entity.CmSku">
         select ifnull(discountPrice, 0) as "discountPrice",
                ifnull(discount, 0)      as "discount",
+               cs.organizeId      as "organizeId",
                ifnull(priceType, 0)     as "priceType"
         from cm_svip_product_sku csps
         left join cm_sku cs on cs.productId = csps.productId
@@ -240,4 +242,4 @@
         where productId = (select productId from cm_svip_product where id = #{id})
     </delete>
 
-</mapper>
+</mapper>

src/main/resources/mappings/modules/weisha/CmOrganizeProductMapper.xml

@@ -38,12 +38,14 @@
         cmop.validFlag as status,
         p.includedTax,
         p.invoiceType,
-        cmps.minBuyNumber
+        cmps.minBuyNumber,
+        cmps.organizeId
         FROM cm_organize_product_info  cmop
         LEFT JOIN product p ON p.productId = cmop.productId
         LEFT JOIN shop s ON s.shopID = p.shopID
-        LEFT JOIN cm_sku cmps ON cmop.productID=cmps.productId
+        LEFT JOIN cm_sku cmps ON cmop.productID=cmps.productId and cmps.organizeId = cmop.organizeId
         <where>
+            p.groundMall like CONCAT('%', copi.organizeId, '%')
             <if test="productId != null and productId != ''">
                 AND cmop.productId = #{productId}
             </if>
@@ -72,6 +74,7 @@
         SELECT
         cmps.skuId,
         cmps.productId,
+        cmps.organizeId,
         cmps.minBuyNumber,
         cmps.price,
         cmps.stock,
@@ -100,11 +103,13 @@
 
     <select id="findProductList" resultType="com.caimei.modules.product.entity.Product">
         select p.productID, p.mainImage, p.name,
-        s.name as shopName, copi.validFlag,k.price
+        s.name as shopName, copi.validFlag
+        ,k.price
+        ,k.organizeId
         from product p
         left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = #{organizeId}
         left join shop s on p.shopID = s.shopID
-        left join cm_sku k on p.productID = k.productId
+        left join cm_sku k on p.productID = k.productId and copi.organizeId= k.organizeId
         <where>
             p.productCategory = 1 AND copi.validFlag not in ( 0,1,8 ) and s.shopType != 2 and copi.productId is null
             AND p.shopID not in (SELECT s.`value` FROM `sys_dict` s WHERE s.type='heheShopID')
@@ -179,6 +184,7 @@
     <select id="getSkuInfo" resultType="com.caimei.modules.product.entity.CmSku">
         SELECT skuId,
                productId,
+               organizeId,
                normalPrice,
                price,
                costPrice,
@@ -249,10 +255,10 @@
                p.taxPoint,
                p.supplierTaxPoint
         FROM product p
-                 left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
+                 left join cm_organize_product_info copi on copi.productId = p.productID
                  LEFT JOIN shop s ON p.shopID = s.shopID
         WHERE p.productCategory = 1
-          AND cmop.id = #{id}
+          AND cmop.id = #{id} and p.groundMall like CONCAT('%', copi.organizeId, '%')
     </select>
 
     <update id="deleteProduct">

src/main/resources/mybatis-config.xml

@@ -6,47 +6,48 @@
 	<settings>
 		<!-- 使全局的映射器启用或禁用缓存。 -->
 		<setting name="cacheEnabled" value="true"/>
-		
+
 		<!-- 全局启用或禁用延迟加载。当禁用时，所有关联对象都会即时加载。 -->
 		<setting name="lazyLoadingEnabled" value="true"/>
-		
+
 		<!-- 当启用时，有延迟加载属性的对象在被调用时将会完全加载任意属性。否则，每种属性将会按需要加载。 -->
 		<setting name="aggressiveLazyLoading" value="true"/>
-		
+
 		<!-- 是否允许单条sql 返回多个数据集  (取决于驱动的兼容性) default:true -->
 		<setting name="multipleResultSetsEnabled" value="true"/>
-		
+
 		<!-- 是否可以使用列的别名 (取决于驱动的兼容性) default:true -->
 		<setting name="useColumnLabel" value="true"/>
-		
+
 		<!-- 允许JDBC 生成主键。需要驱动器支持。如果设为了true，这个设置将强制使用被生成的主键，有一些驱动器不兼容不过仍然可以执行。  default:false  -->
 		<setting name="useGeneratedKeys" value="false"/>
-		
-		<!-- 指定 MyBatis 如何自动映射 数据基表的列 NONE：不隐射　PARTIAL:部分  FULL:全部  -->  
+
+		<!-- 指定 MyBatis 如何自动映射 数据基表的列 NONE：不隐射　PARTIAL:部分  FULL:全部  -->
 		<setting name="autoMappingBehavior" value="PARTIAL"/>
-		
+
 		<!-- 这是默认的执行类型  （SIMPLE: 简单； REUSE: 执行器可能重复使用prepared statements语句；BATCH: 执行器可以重复执行语句和批量更新）  -->
 		<setting name="defaultExecutorType" value="SIMPLE"/>
-		
+
 		<!-- 使用驼峰命名法转换字段。 -->
 		<setting name="mapUnderscoreToCamelCase" value="true"/>
-		
+
 		<!-- 设置本地缓存范围 session:就会有数据的共享  statement:语句范围 (这样就不会有数据的共享 ) defalut:session -->
         <setting name="localCacheScope" value="SESSION"/>
-		
+
         <!-- 设置但JDBC类型为空时,某些驱动程序 要指定值,default:OTHER，插入空值时不需要指定类型 -->
         <setting name="jdbcTypeForNull" value="NULL"/>
-		
+
 	</settings>
-	
+
 	<!-- 类型别名 -->
 	<typeAliases>
 		<typeAlias alias="Page" type="com.thinkgem.jeesite.common.persistence.Page" /><!--分页  -->
+
 	</typeAliases>
-	
+
 	<!-- 插件配置 -->
 	<plugins>
 		<plugin interceptor="com.thinkgem.jeesite.common.persistence.interceptor.PaginationInterceptor" />
     </plugins>
-	
+
 </configuration>

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptForm.jsp

@@ -152,9 +152,9 @@
     <div>
         <div class="receipt-title">
             <h5>收款信息</h5>
-            <c:if test="${vo.receiptStatus != 5 && vo.payWay eq 2}">
-                <a href="#" onclick="cancel(${vo.receiptID})" class="receipt-order-recall">撤销收款</a>
-            </c:if>
+<%--            <c:if test="${vo.receiptStatus != 5 && vo.payWay eq 2}">--%>
+<%--                <a href="#" onclick="cancel(${vo.receiptID})" class="receipt-order-recall">撤销收款</a>--%>
+<%--            </c:if>--%>
         </div>
         <div class="receipt-order-title">
             <span><label>收款ID：</label>${vo.receiptID}</span>
@@ -256,124 +256,124 @@
             </div>
         </c:if>
     </div>
-    <c:if test="${not empty op.shopOrderNo}">
-        <h5>关联订单</h5>
-        <div class="receipt-order-form">
-            <div class="receipt-order-row2">
-                        <span class="font-blue"><label>子订单编号：</label>
-                               <a href="${ctx}/order/detail?id=${op.orderID}">${op.shopOrderNo}（${op.shopOrderId}）</a></span>
-                <span><label>订单金额：</label>¥<fmt:formatNumber
-                        value="${op.productAmount}"
-                        pattern="#0.00"/></span>
-                <span>
-                         <span><label>供应商：</label>${op.shopName}</span>
-                    <span>
-                        <hr style="margin: 10px;"/>
-            </div>
-
-            <div class="receipt-order-row3">
-
-                         <span class="font-blue"><label>订单编号：</label><a
-                                 href="${ctx}/order/detail?id=${op.orderID}">${op.orderNo}（${op.orderID}）</a></span>
-
-                <span><label>订单金额：</label>¥<fmt:formatNumber
-                        value="${op.productAmount}"
-                        pattern="#0.00"/></span>
-
-                <span><label>应收金额：</label>¥<fmt:formatNumber value="${op.needPayAmount}"
-                                                             pattern="#0.00"/></span>
-                <span>
-                            <label>已收金额：</label>¥<fmt:formatNumber
-                        value="${empty op.receiptAmount ? 0 : op.receiptAmount}"
-                        pattern="#0.00"/>
-                            </span>
-                <span><label>机构名称：</label>${op.jgName}</span>
-            </div>
-
-            <label>订单类型：</label><c:if test="${op.orderType eq 0}">普通订单</c:if>
-            <c:if test="${op.orderType eq 1}">协销订单</c:if>
-
-            <span><label>下单日期：</label>${cmDiscernReceipt.confirmDate}</span>
-
-        </div>
-        <c:if test="${not empty orderInfo.receiptRecordVo}">
-            <div class="receipt-order-form">
-                <div class="receipt-order-row4">
-                    <div><h5><label>订单收款记录：</label></h5></div>
-                    <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">
-                        <div class="row4-wrapper">
-                            <span class="row4-order-no">${index.index + 1}、</span>
-                            <span class="row4-time">${receiptRecord.receiptTime}</span>
-                            <c:if test="${receiptRecord.payWay == 1}">
-                                <%--线上收款--%>
-                                <span>线上&nbsp;${receiptRecord.bankNameType}</span>
-                                <span>${receiptRecord.receiptAmount}</span>
-                                <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
-                            </c:if>
-                            <c:if test="${receiptRecord.payWay == 2}">
-                                <span>线下&nbsp;${receiptRecord.bankNameType}</span>
-                                <span>${receiptRecord.receiptAmount}</span>
-                                <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
-                                    <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
-                                </c:if>
-                                <c:if test="${not empty receiptRecord.reviewUserPermissionID}">
-                                    <span>
-                                        <c:if test="${receiptRecord.receiptStatus eq 4}">
-                                            ${receiptRecord.reviewUserName}审核不通过(${receiptRecord.reviewDate})
-                                        </c:if>
-                                        <c:if test="${receiptRecord.receiptStatus ne 4}">
-                                            ${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})
-                                        </c:if>
-                                    </span>
-                                </c:if>
-                            </c:if>
-                            <c:if test="${receiptRecord.payWay == 3}">
-                                <%--余额抵扣--%>
-                                <span><a
-                                        href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
-                                        style="text-decoration: underline">${fns:getPayTypeStr(receiptRecord.payType)}</a></span>
-                                <span><a
-                                        href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
-                                        style="text-decoration: underline">${receiptRecord.receiptAmount}</a></span>
-                            </c:if>
-                            <span>
-    <%--                        一款多单的时候直接显示再订单上即可，无需收款记录显示--%>
-                                <c:if test="${!vo.receiptOrderFlag}">
-                                    <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
-                                        <label>抹平明细：</label>
-                                        <c:if test="${receiptRecord.confirmType eq 1}">
-                                                <font color="red">(少收抹平:
-                                                    ￥<fmt:formatNumber
-                                                            value="${orderInfo.payableAmount - (empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount)}"
-                                                            pattern="#0.00"/>元)
-                                                </font>
-                                        </c:if>
-                                        <c:if test="${receiptRecord.confirmType eq 2}">
-                                                <font color="red">(多收抹平:
-                                                    ￥<fmt:formatNumber
-                                                            value="${(empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount) - orderInfo.payableAmount}"
-                                                            pattern="#0.00"/>元)
-                                                </font>
-                                        </c:if>
-                                        <c:if test="${receiptRecord.confirmType eq 3}">
-                                                <font color="red">(多收退余额${receiptRecord.associationType eq 2 ? "(自动)" : ""}:
-                                                    ￥<fmt:formatNumber
-                                                            value="${(empty receiptRecord.returnBalanceAmount ? 0 : receiptRecord.returnBalanceAmount)}"
-                                                            pattern="#0.00"/>元)
-                                                </font>
-                                        </c:if>
-                                    </c:if>
-                                </c:if>
-                                </span>
-                            <span>
-                                    ${receiptRecord.receiptAmount}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${vo.confirmer} 确认 ${vo.confirmTime}
-                                </span>
-                        </div>
-                    </c:forEach>
-                </div>
-            </div>
-        </c:if>
-    </c:if>
+<%--    <c:if test="${not empty op.shopOrderNo}">--%>
+<%--        <h5>关联订单</h5>--%>
+<%--        <div class="receipt-order-form">--%>
+<%--            <div class="receipt-order-row2">--%>
+<%--                        <span class="font-blue"><label>子订单编号：</label>--%>
+<%--                               <a href="${ctx}/order/detail?id=${op.orderID}">${op.shopOrderNo}（${op.shopOrderId}）</a></span>--%>
+<%--                <span><label>订单金额：</label>¥<fmt:formatNumber--%>
+<%--                        value="${op.productAmount}"--%>
+<%--                        pattern="#0.00"/></span>--%>
+<%--                <span>--%>
+<%--                         <span><label>供应商：</label>${op.shopName}</span>--%>
+<%--                    </span>--%>
+<%--                        <hr style="margin: 10px;"/>--%>
+<%--            </div>--%>
+
+<%--            <div class="receipt-order-row3">--%>
+
+<%--                         <span class="font-blue"><label>订单编号：</label><a--%>
+<%--                                 href="${ctx}/order/detail?id=${op.orderID}">${op.orderNo}（${op.orderID}）</a></span>--%>
+
+<%--                <span><label>订单金额：</label>¥<fmt:formatNumber--%>
+<%--                        value="${op.productAmount}"--%>
+<%--                        pattern="#0.00"/></span>--%>
+
+<%--                <span><label>应收金额：</label>¥<fmt:formatNumber value="${op.needPayAmount}"--%>
+<%--                                                             pattern="#0.00"/></span>--%>
+<%--                <span>--%>
+<%--                            <label>已收金额：</label>¥<fmt:formatNumber--%>
+<%--                        value="${empty op.receiptAmount ? 0 : op.receiptAmount}"--%>
+<%--                        pattern="#0.00"/>--%>
+<%--                            </span>--%>
+<%--                <span><label>机构名称：</label>${op.jgName}</span>--%>
+<%--            </div>--%>
+
+<%--            <label>订单类型：</label><c:if test="${op.orderType eq 0}">普通订单</c:if>--%>
+<%--            <c:if test="${op.orderType eq 1}">协销订单</c:if>--%>
+
+<%--            <span><label>下单日期：</label>${cmDiscernReceipt.confirmDate}</span>--%>
+
+<%--        </div>--%>
+<%--        <c:if test="${not empty orderInfo.receiptRecordVo}">--%>
+<%--            <div class="receipt-order-form">--%>
+<%--                <div class="receipt-order-row4">--%>
+<%--                    <div><h5><label>订单收款记录：</label></h5></div>--%>
+<%--                    <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">--%>
+<%--                        <div class="row4-wrapper">--%>
+<%--                            <span class="row4-order-no">${index.index + 1}、</span>--%>
+<%--                            <span class="row4-time">${receiptRecord.receiptTime}</span>--%>
+<%--                            <c:if test="${receiptRecord.payWay == 1}">--%>
+<%--                                &lt;%&ndash;线上收款&ndash;%&gt;--%>
+<%--                                <span>线上&nbsp;${receiptRecord.bankNameType}</span>--%>
+<%--                                <span>${receiptRecord.receiptAmount}</span>--%>
+<%--                                <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>--%>
+<%--                            </c:if>--%>
+<%--                            <c:if test="${receiptRecord.payWay == 2}">--%>
+<%--                                <span>线下&nbsp;${receiptRecord.bankNameType}</span>--%>
+<%--                                <span>${receiptRecord.receiptAmount}</span>--%>
+<%--                                <c:if test="${not empty receiptRecord.confirmUserPermissionID}">--%>
+<%--                                    <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>--%>
+<%--                                </c:if>--%>
+<%--                                <c:if test="${not empty receiptRecord.reviewUserPermissionID}">--%>
+<%--                                    <span>--%>
+<%--                                        <c:if test="${receiptRecord.receiptStatus eq 4}">--%>
+<%--                                            ${receiptRecord.reviewUserName}审核不通过(${receiptRecord.reviewDate})--%>
+<%--                                        </c:if>--%>
+<%--                                        <c:if test="${receiptRecord.receiptStatus ne 4}">--%>
+<%--                                            ${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})--%>
+<%--                                        </c:if>--%>
+<%--                                    </span>--%>
+<%--                                </c:if>--%>
+<%--                            </c:if>--%>
+<%--                            <c:if test="${receiptRecord.payWay == 3}">--%>
+<%--                                &lt;%&ndash;余额抵扣&ndash;%&gt;--%>
+<%--                                <span><a--%>
+<%--                                        href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"--%>
+<%--                                        style="text-decoration: underline">${fns:getPayTypeStr(receiptRecord.payType)}</a></span>--%>
+<%--                                <span><a--%>
+<%--                                        href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"--%>
+<%--                                        style="text-decoration: underline">${receiptRecord.receiptAmount}</a></span>--%>
+<%--                            </c:if>--%>
+<%--                            <span>--%>
+<%--    &lt;%&ndash;                        一款多单的时候直接显示再订单上即可，无需收款记录显示&ndash;%&gt;--%>
+<%--                                <c:if test="${!vo.receiptOrderFlag}">--%>
+<%--                                    <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">--%>
+<%--                                        <label>抹平明细：</label>--%>
+<%--                                        <c:if test="${receiptRecord.confirmType eq 1}">--%>
+<%--                                                <font color="red">(少收抹平:--%>
+<%--                                                    ￥<fmt:formatNumber--%>
+<%--                                                            value="${orderInfo.payableAmount - (empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount)}"--%>
+<%--                                                            pattern="#0.00"/>元)--%>
+<%--                                                </font>--%>
+<%--                                        </c:if>--%>
+<%--                                        <c:if test="${receiptRecord.confirmType eq 2}">--%>
+<%--                                                <font color="red">(多收抹平:--%>
+<%--                                                    ￥<fmt:formatNumber--%>
+<%--                                                            value="${(empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount) - orderInfo.payableAmount}"--%>
+<%--                                                            pattern="#0.00"/>元)--%>
+<%--                                                </font>--%>
+<%--                                        </c:if>--%>
+<%--                                        <c:if test="${receiptRecord.confirmType eq 3}">--%>
+<%--                                                <font color="red">(多收退余额${receiptRecord.associationType eq 2 ? "(自动)" : ""}:--%>
+<%--                                                    ￥<fmt:formatNumber--%>
+<%--                                                            value="${(empty receiptRecord.returnBalanceAmount ? 0 : receiptRecord.returnBalanceAmount)}"--%>
+<%--                                                            pattern="#0.00"/>元)--%>
+<%--                                                </font>--%>
+<%--                                        </c:if>--%>
+<%--                                    </c:if>--%>
+<%--                                </c:if>--%>
+<%--                                </span>--%>
+<%--                            <span>--%>
+<%--                                    ${receiptRecord.receiptAmount}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${vo.confirmer} 确认 ${vo.confirmTime}--%>
+<%--                                </span>--%>
+<%--                        </div>--%>
+<%--                    </c:forEach>--%>
+<%--                </div>--%>
+<%--            </div>--%>
+<%--        </c:if>--%>
+<%--    </c:if>--%>
 
 
     <c:if test="${vo.receiptType != 2 and vo.receiptType != 6 and vo.receiptType != 7 and vo.receiptType != 8}">
@@ -381,36 +381,38 @@
         <div class="receipt-order-form">
             <c:forEach items="${vo.orderInfos}" var="orderInfo">
                 <div class="receipt-order-form">
-                    <c:if test="${vo.receiptType == 3 || vo.receiptType == 5}">
-                        <div class="receipt-suborder-title">
+<%--                    <c:if test="${vo.receiptType == 3 || vo.receiptType == 5}">--%>
+<%--                        <div class="receipt-suborder-title">--%>
+<%--                        <span class="font-blue"><label>子订单编号：</label><a--%>
+<%--                                href="${ctx}/order/detail?id=${orderInfo.orderID}">${orderInfo.shopOrderNo}(${orderInfo.shopOrderID})</a></span>--%>
+<%--                            <span><label>订单金额：</label>¥<fmt:formatNumber value="${orderInfo.shopOrderAmount}"--%>
+<%--                                                                         pattern="#0.00"/></span>--%>
+<%--                            <span><label>供应商：</label>${orderInfo.shopName}</span>--%>
+<%--                            <c:if test="${vo.receiptType == 5}">--%>
+<%--                            <span><label>应付金额：</label>¥<fmt:formatNumber value="${orderInfo.shouldPayShopAmount}"--%>
+<%--                                                                         pattern="#0.00"/></span>--%>
+<%--                                <span><label>已付金额：</label>¥<fmt:formatNumber value="${orderInfo.payedShopAmount}"--%>
+<%--                                                                             pattern="#0.00"/></span>--%>
+<%--                                <span><label>已退金额：</label>¥<fmt:formatNumber value="${orderInfo.refundsAmount}"--%>
+<%--                                                                             pattern="#0.00"/></span>--%>
+
+<%--                            </c:if>--%>
+<%--                        </div>--%>
+<%--                    </c:if>--%>
+                    <div class="receipt-order-row2">
                         <span class="font-blue"><label>子订单编号：</label><a
-                                href="${ctx}/order/detail?id=${orderInfo.orderID}">${orderInfo.shopOrderNo}(${orderInfo.shopOrderID})</a></span>
-                            <span><label>订单金额：</label>¥<fmt:formatNumber value="${orderInfo.shopOrderAmount}"
-                                                                         pattern="#0.00"/></span>
-                            <span><label>供应商：</label>${orderInfo.shopName}</span>
-                            <c:if test="${vo.receiptType == 5}">
-                            <span><label>应付金额：</label>¥<fmt:formatNumber value="${orderInfo.shouldPayShopAmount}"
-                                                                         pattern="#0.00"/></span>
-                                <span><label>已付金额：</label>¥<fmt:formatNumber value="${orderInfo.payedShopAmount}"
-                                                                             pattern="#0.00"/></span>
-                                <span><label>已退金额：</label>¥<fmt:formatNumber value="${orderInfo.refundsAmount}"
-                                                                             pattern="#0.00"/></span>
+                                href="${ctx}/order/detail?id=${orderInfo.orderID}&shopOrderID=${orderInfo.shopOrderID}">${orderInfo.shopOrderNo}（${orderInfo.shopOrderID}）</a></span>
+<%--                                href="${ctx}/order/detail?id=${orderInfo.orderID}">${orderInfo.orderNo}（${orderInfo.orderID}）</a></span>--%>
 
-                            </c:if>
-                        </div>
-                    </c:if>
-                    <div class="receipt-order-row2">
-                        <span class="font-blue"><label>订单编号：</label><a
-                                href="${ctx}/order/detail?id=${orderInfo.orderID}">${orderInfo.orderNo}（${orderInfo.orderID}）</a></span>
-                        <span><label>订单金额：</label>¥<fmt:formatNumber
-                                value="${orderInfo.orderAmount}"
-                                pattern="#0.00"/></span>
+<%--                        <span><label>订单金额：</label>¥<fmt:formatNumber--%>
+<%--                                value="${orderInfo.orderAmount}"--%>
+<%--                                pattern="#0.00"/></span>--%>
                         <span>
-                            <span><label>应收金额：</label>¥<fmt:formatNumber value="${orderInfo.payableAmount}"
+                            <span><label>子订单应收金额：</label>¥<fmt:formatNumber value="${orderInfo.shouldPayShopAmount}"
                                                                          pattern="#0.00"/></span>
                             <span>
-                            <label>已收金额：</label>¥<fmt:formatNumber
-                                    value="${empty orderInfo.receiptAmount ? 0 : orderInfo.receiptAmount}"
+                            <label>子订单已收金额：</label>¥<fmt:formatNumber
+                                    value="${empty orderInfo.receiptAmount ? 0 : orderInfo.payedShopAmount}"
                                     pattern="#0.00"/>
 
                             <span>
@@ -458,6 +460,11 @@
                                     </c:forEach>
                                 </span>
                             </span>
+                                  <span><label>子订单收款状态：</label>
+                                        <c:if test="${orderInfo.receiptStatus == 1}">待收款</c:if>
+                                        <c:if test="${orderInfo.receiptStatus == 2}">部分收款</c:if>
+                                        <c:if test="${orderInfo.receiptStatus == 3}">已收款</c:if>
+                                  </span>
                             <span><label>机构名称：</label>
                                         <c:if test="${orderInfo.organizeID == 1}">
                                             <span class="org-note">星范</span>
@@ -468,6 +475,7 @@
                                 </c:if>
                             </span>
                             <span><label>订单状态：</label>
+<%--                                orderStatusFlag--%>
                                         <c:if test="${orderInfo.receiptStatus == 1}">待收款</c:if>
                                         <c:if test="${orderInfo.receiptStatus == 2}">部分收款</c:if>
                                         <c:if test="${orderInfo.receiptStatus == 3}">已收款</c:if>
@@ -489,80 +497,80 @@
                             <span>子订单收款状态：${fns:getDictLabel(shopOrder.shopReceiptStatus,'receiptStatus' ,'' )}</span>
                         </c:forEach>
                     </div>
-                    <div class="receipt-order-row4">
-                        <div><h5><label>订单收款记录：</label></h5></div>
-                        <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">
-                            <div class="row4-wrapper">
-                                <span class="row4-order-no">${index.index + 1}、</span>
-                                <span class="row4-time">${receiptRecord.receiptTime}</span>
-                                <c:if test="${receiptRecord.payWay == 1}">
-                                    <%--线上收款--%>
-                                    <span>线上&nbsp;${receiptRecord.bankNameType}</span>
-                                    <span>${receiptRecord.receiptAmount}</span>
-                                    <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
-                                </c:if>
-                                <c:if test="${receiptRecord.payWay == 2}">
-                                    <span>线下&nbsp;${receiptRecord.bankNameType}</span>
-                                    <span>${receiptRecord.receiptAmount}</span>
-                                    <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
-                                        <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
-                                    </c:if>
-                                    <c:if test="${not empty receiptRecord.reviewUserPermissionID}">
-                                    <span>
-                                        <c:if test="${receiptRecord.receiptStatus eq 4}">
-                                            ${receiptRecord.reviewUserName}审核不通过(${receiptRecord.reviewDate})
-                                        </c:if>
-                                        <c:if test="${receiptRecord.receiptStatus ne 4}">
-                                            ${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})
-                                        </c:if>
-                                    </span>
-                                    </c:if>
-                                </c:if>
-                                <c:if test="${receiptRecord.payWay == 3}">
-                                    <%--余额抵扣--%>
-                                    <span><a
-                                            href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
-                                            style="text-decoration: underline">${fns:getPayTypeStr(receiptRecord.payType)}</a></span>
-                                    <span><a
-                                            href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
-                                            style="text-decoration: underline">${receiptRecord.receiptAmount}</a></span>
-                                </c:if>
-                                <span>
-    <%--                        一款多单的时候直接显示再订单上即可，无需收款记录显示--%>
-                                <c:if test="${!vo.receiptOrderFlag}">
-                                    <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
-                                        <label>抹平明细：</label>
-                                        <c:if test="${receiptRecord.confirmType eq 1}">
-                                                <font color="red">(少收抹平:
-                                                    ￥<fmt:formatNumber
-                                                            value="${orderInfo.payableAmount - (empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount)}"
-                                                            pattern="#0.00"/>元)
-                                                </font>
-                                        </c:if>
-                                        <c:if test="${receiptRecord.confirmType eq 2}">
-                                                <font color="red">(多收抹平:
-                                                    ￥<fmt:formatNumber
-                                                            value="${(empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount) - orderInfo.payableAmount}"
-                                                            pattern="#0.00"/>元)
-                                                </font>
-                                        </c:if>
-                                        <c:if test="${receiptRecord.confirmType eq 3}">
-                                                <font color="red">(多收退余额${receiptRecord.associationType eq 2 ? "(自动)" : ""}:
-                                                    ￥<fmt:formatNumber
-                                                            value="${(empty receiptRecord.returnBalanceAmount ? 0 : receiptRecord.returnBalanceAmount)}"
-                                                            pattern="#0.00"/>元)
-                                                </font>
-                                        </c:if>
-                                    </c:if>
-                                </c:if>
-                                </span>
+<%--                    <div class="receipt-order-row4">--%>
+<%--                        <div><h5><label>订单收款记录：</label></h5></div>--%>
+<%--                        <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">--%>
+<%--                            <div class="row4-wrapper">--%>
+<%--                                <span class="row4-order-no">${index.index + 1}、</span>--%>
+<%--                                <span class="row4-time">${receiptRecord.receiptTime}</span>--%>
+<%--                                <c:if test="${receiptRecord.payWay == 1}">--%>
+<%--                                    &lt;%&ndash;线上收款&ndash;%&gt;--%>
+<%--                                    <span>线上&nbsp;${receiptRecord.bankNameType}</span>--%>
+<%--                                    <span>${receiptRecord.receiptAmount}</span>--%>
+<%--                                    <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>--%>
+<%--                                </c:if>--%>
+<%--                                <c:if test="${receiptRecord.payWay == 2}">--%>
+<%--                                    <span>线下&nbsp;${receiptRecord.bankNameType}</span>--%>
+<%--                                    <span>${receiptRecord.receiptAmount}</span>--%>
+<%--                                    <c:if test="${not empty receiptRecord.confirmUserPermissionID}">--%>
+<%--                                        <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>--%>
+<%--                                    </c:if>--%>
+<%--                                    <c:if test="${not empty receiptRecord.reviewUserPermissionID}">--%>
+<%--                                    <span>--%>
+<%--                                        <c:if test="${receiptRecord.receiptStatus eq 4}">--%>
+<%--                                            ${receiptRecord.reviewUserName}审核不通过(${receiptRecord.reviewDate})--%>
+<%--                                        </c:if>--%>
+<%--                                        <c:if test="${receiptRecord.receiptStatus ne 4}">--%>
+<%--                                            ${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})--%>
+<%--                                        </c:if>--%>
+<%--                                    </span>--%>
+<%--                                    </c:if>--%>
+<%--                                </c:if>--%>
+<%--                                <c:if test="${receiptRecord.payWay == 3}">--%>
+<%--                                    &lt;%&ndash;余额抵扣&ndash;%&gt;--%>
+<%--                                    <span><a--%>
+<%--                                            href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"--%>
+<%--                                            style="text-decoration: underline">${fns:getPayTypeStr(receiptRecord.payType)}</a></span>--%>
+<%--                                    <span><a--%>
+<%--                                            href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"--%>
+<%--                                            style="text-decoration: underline">${receiptRecord.receiptAmount}</a></span>--%>
+<%--                                </c:if>--%>
 <%--                                <span>--%>
-<%--                                    ${receiptRecord.receiptAmount}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${vo.confirmer} 确认 ${vo.confirmTime}--%>
+<%--    &lt;%&ndash;                        一款多单的时候直接显示再订单上即可，无需收款记录显示&ndash;%&gt;--%>
+<%--                                <c:if test="${!vo.receiptOrderFlag}">--%>
+<%--                                    <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">--%>
+<%--                                        <label>抹平明细：</label>--%>
+<%--                                        <c:if test="${receiptRecord.confirmType eq 1}">--%>
+<%--                                                <font color="red">(少收抹平:--%>
+<%--                                                    ￥<fmt:formatNumber--%>
+<%--                                                            value="${orderInfo.payableAmount - (empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount)}"--%>
+<%--                                                            pattern="#0.00"/>元)--%>
+<%--                                                </font>--%>
+<%--                                        </c:if>--%>
+<%--                                        <c:if test="${receiptRecord.confirmType eq 2}">--%>
+<%--                                                <font color="red">(多收抹平:--%>
+<%--                                                    ￥<fmt:formatNumber--%>
+<%--                                                            value="${(empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount) - orderInfo.payableAmount}"--%>
+<%--                                                            pattern="#0.00"/>元)--%>
+<%--                                                </font>--%>
+<%--                                        </c:if>--%>
+<%--                                        <c:if test="${receiptRecord.confirmType eq 3}">--%>
+<%--                                                <font color="red">(多收退余额${receiptRecord.associationType eq 2 ? "(自动)" : ""}:--%>
+<%--                                                    ￥<fmt:formatNumber--%>
+<%--                                                            value="${(empty receiptRecord.returnBalanceAmount ? 0 : receiptRecord.returnBalanceAmount)}"--%>
+<%--                                                            pattern="#0.00"/>元)--%>
+<%--                                                </font>--%>
+<%--                                        </c:if>--%>
+<%--                                    </c:if>--%>
+<%--                                </c:if>--%>
 <%--                                </span>--%>
-                            </div>
-                        </c:forEach>
-                    </div>
-                </div>
+<%--&lt;%&ndash;                                <span>&ndash;%&gt;--%>
+<%--&lt;%&ndash;                                    ${receiptRecord.receiptAmount}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${vo.confirmer} 确认 ${vo.confirmTime}&ndash;%&gt;--%>
+<%--&lt;%&ndash;                                </span>&ndash;%&gt;--%>
+<%--                            </div>--%>
+<%--                        </c:forEach>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
                 <br>
             </c:forEach>
         </div>

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptList.jsp

@@ -117,7 +117,7 @@
             <label>收款ID：</label>
             <form:input path="id" htmlEscape="false" maxlength="20" class="input-medium" onchange="onlynum(this)"/>
             <label>订单ID：</label>
-            <form:input path="orderID" htmlEscape="false" maxlength="20" class="input-medium" onchange="onlynum(this)"/>
+            <form:input path="shopOrderId" htmlEscape="false" maxlength="20" class="input-medium" onchange="onlynum(this)"/>
             <label>订单编号：</label>
             <form:input path="orderNo" htmlEscape="false" maxlength="50" class="input-medium"/>
             <label>机构名称：</label>
@@ -164,12 +164,12 @@
             </form:select>
         </div>
         <div>
-            <label>收款进度：</label>
-            <form:select path="receiptProgress" class="select-ele input-medium">
-                <form:option value="" label="全部"/>
-                <form:options items="${fns:getDictList('receiptProgress')}" itemLabel="label" itemValue="value"
-                              htmlEscape="false"/>
-            </form:select>
+<%--            <label>收款进度：</label>--%>
+<%--            <form:select path="receiptProgress" class="select-ele input-medium">--%>
+<%--                <form:option value="" label="全部"/>--%>
+<%--                <form:options items="${fns:getDictList('receiptProgress')}" itemLabel="label" itemValue="value"--%>
+<%--                              htmlEscape="false"/>--%>
+<%--            </form:select>--%>
             <label>订单类型：</label>
             <form:select path="receiptOrderType" class="select-ele input-medium">
                 <form:option value="" label="全部"/>
@@ -274,7 +274,7 @@
             </td>
             <td>
                 <c:if test="${cmDiscernReceipt.organizeID == 1||cmDiscernReceipt.organizeID == 4}">
-                <span class="org-note">线下凭证</span>
+                <span >线下凭证</span>
                 </c:if>
                 <c:if test="${!(cmDiscernReceipt.organizeID == 1||cmDiscernReceipt.organizeID == 4)}">
                 <span class="org-note"> ${cmDiscernReceipt.bankNameType}</span>
@@ -334,15 +334,16 @@
                 <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>
             </td>
            <td>   <%--  <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.orderID}）</a>--%>
-                <c:if test="${cmDiscernReceipt.newReceiptType eq 2 && not empty cmDiscernReceipt.shopOrderNos}"><a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNos}（${cmDiscernReceipt.orderID}）</a></c:if>
-                <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orders}</c:if>
-                <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>
-                <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>
-                <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>
+<%--                <c:if test="${cmDiscernReceipt.newReceiptType eq 2 && not empty cmDiscernReceipt.shopOrderNo}"><a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.shopOrderId}）</a></c:if>--%>
+<%--                <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orders}</c:if>--%>
+<%--                <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>--%>
+<%--                <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>--%>
+<%--                <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>--%>
+               <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}&shopOrderID=${cmDiscernReceipt.shopOrderId}">子订单${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.shopOrderId}）</a>
             </td>
             <shiro:hasPermission name="order:cmDiscernReceipt:edit">
                 <td>
-                    <a href="${ctx}/order/cmDiscernReceipt/detail?checkMan=${cmDiscernReceipt.checkMan}&orderID=${cmDiscernReceipt.orderID}&shopName=${cmDiscernReceipt.shopName}&id=${cmDiscernReceipt.id}&organizeID=${cmDiscernReceipt.organizeID}">查看详情</a>
+                    <a href="${ctx}/order/cmDiscernReceipt/detail?checkMan=${cmDiscernReceipt.checkMan}&orderID=${cmDiscernReceipt.orderID}&shopName=${cmDiscernReceipt.shopName}&id=${cmDiscernReceipt.id}&organizeID=${cmDiscernReceipt.organizeID}&shopOrderId=${cmDiscernReceipt.shopOrderId}">查看详情</a>
                 </td>
             </shiro:hasPermission>
         </tr>

src/main/webapp/WEB-INF/views/modules/order/cmPayFormList.jsp

@@ -38,11 +38,11 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li class="active"><a href="${ctx}/order/cmPayShop/">付款列表</a></li>
-		<shiro:hasPermission name="order:cmPayShop:view">
-            <li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
-			<li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
-        </shiro:hasPermission>
+<%--		<li class="active"><a href="${ctx}/order/cmPayShop/">付款列表</a></li>--%>
+<%--		<shiro:hasPermission name="order:cmPayShop:view">--%>
+<%--            <li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>--%>
+<%--			<li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>--%>
+<%--        </shiro:hasPermission>--%>
 		<shiro:hasPermission name="order:cmPayShop:split">
 			<li><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
 		</shiro:hasPermission>

src/main/webapp/WEB-INF/views/modules/order/cmReturnedPurchaseList.jsp

@@ -99,10 +99,10 @@
 			<div>
 				<label>退款编号：</label>
 				<form:input path="returnedNo" htmlEscape="false" maxlength="30" class="input-medium"/>
-				<label><font title="主订单订单ID">订单ID：</font></label>
-				<form:input path="orderID" htmlEscape="false" maxlength="9" onchange="onlynum(this)" class="input-medium"/>
-				<label><font title="主订单编号">订单编号：</font></label>
-				<form:input path="orderNo" htmlEscape="false" maxlength="25" class="input-medium"/>
+				<label><font title="子订单订单ID">订单ID：</font></label>
+				<form:input path="shopOrderID" htmlEscape="false" maxlength="9" onchange="onlynum(this)" class="input-medium"/>
+				<label><font title="子订单编号">订单编号：</font></label>
+				<form:input path="shopOrderNo" htmlEscape="false" maxlength="25" class="input-medium"/>
 				<label>${empty orderType ? "机构" : "买家"}：</label>
 				<form:input path="name" htmlEscape="false" maxlength="20" class="input-medium"/>
 			</div>
@@ -209,17 +209,17 @@
 				<td>
 					<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecord.rpc?id=${cmReturnedPurchase.id}&orderID=${cmReturnedPurchase.orderID}&shopOrderID=${cmReturnedPurchase.shopOrderID}">查看详情</a>
 					<%--待审核----{审核退款}--%>
-					<c:if test="${cmReturnedPurchase.status eq 1}">
-							<shiro:hasPermission name="order:cmReturnedPurchase:shenqing">
-								<a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${cmReturnedPurchase.orderID}&id=${cmReturnedPurchase.id}" >申请退款</a>
-							</shiro:hasPermission>
-							<shiro:hasPermission name="order:cmReturnedPurchase:shenhe">
-								<a href="${ctx}/bulkpurchase/cmRefundsProduct/toReviewRecturnRecord.rpc?id=${cmReturnedPurchase.id}&orderID=${cmReturnedPurchase.orderID}&shopOrderID=${cmReturnedPurchase.shopOrderID}">审核退款</a>
-							</shiro:hasPermission>
-							<shiro:hasPermission name="order:cmReturnedPurchase:quxiao">
-								<a href="#" onclick="cancelApply1(${cmReturnedPurchase.id})">取消退款</a>
-							</shiro:hasPermission>
-					</c:if>
+<%--					<c:if test="${cmReturnedPurchase.status eq 1}">--%>
+<%--							<shiro:hasPermission name="order:cmReturnedPurchase:shenqing">--%>
+<%--								<a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${cmReturnedPurchase.orderID}&id=${cmReturnedPurchase.id}" >申请退款</a>--%>
+<%--							</shiro:hasPermission>--%>
+<%--							<shiro:hasPermission name="order:cmReturnedPurchase:shenhe">--%>
+<%--								<a href="${ctx}/bulkpurchase/cmRefundsProduct/toReviewRecturnRecord.rpc?id=${cmReturnedPurchase.id}&orderID=${cmReturnedPurchase.orderID}&shopOrderID=${cmReturnedPurchase.shopOrderID}">审核退款</a>--%>
+<%--							</shiro:hasPermission>--%>
+<%--							<shiro:hasPermission name="order:cmReturnedPurchase:quxiao">--%>
+<%--								<a href="#" onclick="cancelApply1(${cmReturnedPurchase.id})">取消退款</a>--%>
+<%--							</shiro:hasPermission>--%>
+<%--					</c:if>--%>
 					<%--审核通过---{撤销}--%>
 					<c:if test="${cmReturnedPurchase.status eq 2}">
 						<%--线上退款,不可撤销--%>
@@ -230,14 +230,14 @@
 						</c:if>
 					</c:if>
 					<%--审核不通过----{取消退款}--%>
-					<c:if test="${cmReturnedPurchase.status eq 3}">
-						<shiro:hasPermission name="order:cmReturnedPurchase:chognshen">
-						<a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${cmReturnedPurchase.orderID}&id=${cmReturnedPurchase.id}" >重申退款</a>
-						</shiro:hasPermission>
-						<shiro:hasPermission name="order:cmReturnedPurchase:quxiao">
-							<a href="#" onclick="cancelApply1(${cmReturnedPurchase.id})">取消退款</a>
-						</shiro:hasPermission>
-					</c:if>
+<%--					<c:if test="${cmReturnedPurchase.status eq 3}">--%>
+<%--						<shiro:hasPermission name="order:cmReturnedPurchase:chognshen">--%>
+<%--						<a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${cmReturnedPurchase.orderID}&id=${cmReturnedPurchase.id}" >重申退款</a>--%>
+<%--						</shiro:hasPermission>--%>
+<%--						<shiro:hasPermission name="order:cmReturnedPurchase:quxiao">--%>
+<%--							<a href="#" onclick="cancelApply1(${cmReturnedPurchase.id})">取消退款</a>--%>
+<%--						</shiro:hasPermission>--%>
+<%--					</c:if>--%>
 				</td>
 			</tr>
 		</c:forEach>

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -250,7 +250,7 @@
             background: #fff;
             width: 125px;
             position: absolute;
-            left: 35px;
+            left: 816px;
             top: 30px;
             padding: 10px;
             border: 1px solid #666;
@@ -638,28 +638,28 @@
                 <c:if test="${order.discountFee le 0}">¥0.00</c:if>
             </td>
         </c:if>
-        <td>运费：
-            <c:if test="${order.organizeID != 4}">
-                <c:if test="${order.freePostFlag == 0}">
-                    包邮
-                </c:if>
-                <c:if test="${order.freePostFlag == -1}">
-                    到付
-                </c:if>
-                <c:if test="${order.freePostFlag == -2}">
-                    仪器到付-产品包邮
-                </c:if>
-                <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
-                    <fmt:formatNumber value="${order.freight}" type="currency"/>
-                </c:if>
-                <c:if test="${order.userBeans > 0}">
-                    <font color="red">（采美豆抵用：${order.userBeans}）</font>
-                </c:if>
-            </c:if>
-            <c:if test="${order.organizeID == 4}">
-                ${postageInfo}
-            </c:if>
-        </td>
+        <%--        <td>运费：--%>
+        <%--            <c:if test="${order.organizeID != 4}">--%>
+        <%--                <c:if test="${order.freePostFlag == 0}">--%>
+        <%--                    包邮--%>
+        <%--                </c:if>--%>
+        <%--                <c:if test="${order.freePostFlag == -1}">--%>
+        <%--                    到付--%>
+        <%--                </c:if>--%>
+        <%--                <c:if test="${order.freePostFlag == -2}">--%>
+        <%--                    仪器到付-产品包邮--%>
+        <%--                </c:if>--%>
+        <%--                <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">--%>
+        <%--                    <fmt:formatNumber value="${order.freight}" type="currency"/>--%>
+        <%--                </c:if>--%>
+        <%--                <c:if test="${order.userBeans > 0}">--%>
+        <%--                    <font color="red">（采美豆抵用：${order.userBeans}）</font>--%>
+        <%--                </c:if>--%>
+        <%--            </c:if>--%>
+        <%--            <c:if test="${order.organizeID == 4}">--%>
+        <%--                ${postageInfo}--%>
+        <%--            </c:if>--%>
+        <%--        </td>--%>
         <%--                    <td style="position: relative;"><a class="operation-btn btn">功能</a>--%>
         <%--                        <div class="operation-block">--%>
         <%--                            <shiro:hasPermission name="order:order:edit">--%>
@@ -837,146 +837,27 @@
             <div class="operation-block">
                 <shiro:hasPermission name="order:order:edit">
                     <%--包含订单充值商品就不显示--%>
-                    <%--                    <c:if test="${order.rechargeGoods ne 1 and order.rechargeGoods ne 2}">--%>
-                    <%--                        <c:if test="${order.status == 11 || order.status == 12 || order.status == 21 || order.status == 22 || order.status == 31 || order.status == 32}">--%>
-                    <%--                            <a href="${ctx}/order/toDeliveryPage?id=${order.orderID}">发货</a>--%>
-                    <%--                        </c:if>--%>
-                    <%--                        <c:if test="${order.receiptStatus == 2 && order.status != 6 && order.status != 7&& order.organizeID != 4}">--%>
-                    <%--                            <a href="javascript:void(0);" onclick="collection(${order.orderID})">抹平收款</a>--%>
-                    <%--                        </c:if>--%>
-                    <%--                    </c:if>--%>
                     <c:if test="${order.status == 0}">
                         <a href="${ctx}/order/confirmOrder?orderID=${order.orderID}"
                            onclick="return confirmx('是否确认订单?', this.href)">确认订单</a>
                     </c:if>
-                    <%--                            <c:if test="${order.status == 0 || order.status == 11}">--%>
-                    <%--                                <a href="${ctx}/order/cancelOrder?orderID=${order.orderID}"--%>
-                    <%--                                   onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>--%>
-                    <%--                            </c:if>--%>
-                    <%--                            <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||--%>
-                    <%--				            order.status eq 23 || order.status eq 0}">--%>
-                    <%--                                <c:if test="${order.rechargeGoods ne 1 && order.rechargeGoods ne 2 && (order.ableUserMoney > 0 || order.status eq 0)}">--%>
-                    <%--                                    <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">--%>
-                    <%--                                        <a href="${ctx}/order/form?id=${order.orderID}">修改订单</a>--%>
-                    <%--                                    </c:if>--%>
-                    <%--                                    <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag == 1}">--%>
-                    <%--                                        <a href="${ctx}/order/secondeProductOrderForm?id=${order.orderID}">修改订单</a>--%>
-                    <%--                                    </c:if>--%>
-                    <%--                                </c:if>--%>
-                    <%--                            </c:if>--%>
-                    <%--                            <c:if test="${order.status == 0}">--%>
-                    <%--                                <c:if test="${order.postageOrderFlag == 1}">--%>
-                    <%--                                    <a href="${ctx}/order/postageOrderForm?id=${order.orderID}">修改邮费订单</a>--%>
-                    <%--                                </c:if>--%>
-                    <%--                            </c:if>--%>
-                    <%--                        <c:if test="${(order.organizeID == 0 or order.organizeID > 2) && order.status == 11 && order.payStatus == 1}">--%>
-                    <%--                            <a href="javascript:void(0);"--%>
-                    <%--                               onclick="modelShow('${order.orderID}')">编辑经理折扣</a>--%>
-                    <%--                        </c:if>--%>
-
-                    <%--                        <c:if test="${order.secondHandOrderFlag ne 1 && order.rebateFlag ne 1 && order.status != 0 && order.status != 6 && order.status != 7 && empty order.rechargeGoods}">--%>
-                    <%--                            <a href="javascript:void(0);"--%>
-                    <%--                               onclick="rebateFeeEdit('${order.orderID}')">编辑返佣服务费</a>--%>
-                    <%--                        </c:if>--%>
-
-                    <%--                        <c:if test="${order.orderType != 1 && order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1 && order.secondHandOrderFlag ne 1 && order.rechargeGoods ne 1 && order.rechargeGoods ne 3}">--%>
-                    <%--                            <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"--%>
-                    <%--                               onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>--%>
-                    <%--                        </c:if>--%>
-                    <%--                        <c:if test="${order.orderType != 1 && order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1 && order.secondHandOrderFlag eq 1}">--%>
-                    <%--                            <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"--%>
-                    <%--                               onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为二手返佣订单</a>--%>
-                    <%--                        </c:if>--%>
                 </shiro:hasPermission>
 
 
                 <shiro:hasPermission name="order:order:edit">
-
-
                     <%--包含订单充值商品就不显示--%>
-                    <c:if test="${order.rechargeGoods ne 1 and order.rechargeGoods ne 2}">
-                        <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6}">
-                            <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>
-                        </c:if>
-                        <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">
-                            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&shopOrderID=${shopOrder.shopOrderID}&from=2">收付款记录
-                            </a>
-                        </c:if>
-                        <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">
-                            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}&shopOrderID=${shopOrder.shopOrderID}">退款（退货）记录
-                            </a>
-                        </c:if>
-                    </c:if>
+                    <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>
+                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&shopOrderID=${shopOrder.shopOrderID}&from=2">收付款记录</a>
+                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}&shopOrderID=${shopOrder.shopOrderID}">退款（退货）记录</a>
                     <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2">订单备注</a>
-
                 </shiro:hasPermission>
             </div>
         </td>
         </tr>
-            <%--        <c:if test="${shopOrder.postFeeCos eq '0'}">--%>
-            <%--            <div class="print-wrapper">--%>
-            <%--                <a href="${ctx}/order/printOrder?shopOrderID=${shopOrder.shopOrderID}">打印</a>--%>
-            <%--                <a href="${ctx}/order/exportSubOrder?shopOrderID=${shopOrder.shopOrderID}">导出</a>--%>
-            <%--                <c:if test="${order.status ne '0'}">--%>
-            <%--                    <a onclick="copyText('${shopOrder.shopOrderID}')" style="cursor:pointer;">供应商订单二维码</a>--%>
-            <%--                </c:if>--%>
-            <%--                <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&from=2">收付款记录</a>--%>
-            <%--                <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}">退款（退货）记录</a>--%>
-            <%--                <c:if test="${order.onlinePayFlag eq 0}">--%>
-            <%--                    <c:if test="${order.status == 12 || order.status == 13 || order.status == 21 || order.status == 22 || order.status == 23 || order.status == 31 || order.status == 32 || order.status == 33 || order.status == 4 || order.status == 5}">--%>
-            <%--                        &lt;%&ndash;  返佣订单不能申请退款（退货） &ndash;%&gt;--%>
-            <%--                        <c:if test="${order.rebateOrder == '0'}">--%>
-            <%--                            <c:if test="${order.toAudit eq 1}">--%>
-            <%--                                &lt;%&ndash;如果存在审核收款则不允许申请:1不能申请,其它可以申请&ndash;%&gt;--%>
-            <%--                                <c:if test="${order.toAudit eq 1}">--%>
-            <%--                                    &lt;%&ndash;弹窗提示&ndash;%&gt;--%>
-            <%--                                    <a href="#" onclick="return alertx('订单存在未审核的收款，暂不能退款。请将收款审核通过后再操作退款。')">申请退款</a>--%>
-            <%--                                </c:if>--%>
-            <%--                            </c:if>--%>
-            <%--                            <c:if test="${order.toAudit ne 1}">--%>
-            <%--                                <c:if test="${order.applyReturnedPurchaseFlag eq 1}">--%>
-            <%--                                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}&onlineShopOrderId=${shopOrder.shopOrderID}&refundType=1&returnGoodsStutas=${order.returnGoodsStutas}"--%>
-            <%--                                       <c:if test="${order.status == 21 || order.status == 22 || order.status == 23}">onclick="return confirmx('部分收款的订单、申请退款只能申请全部退款！', this.href)"--%>
-            <%--                                    </c:if>--%>
-            <%--                                    >申请退款</a>--%>
-            <%--                                </c:if>--%>
-            <%--                                <c:if test="${order.applyReturnedPurchaseFlag ne 1}">--%>
-            <%--                                    <font title="存在未处理完的申请,请前往退款列表处理！">申请退款</font>--%>
-            <%--                                </c:if>--%>
-            <%--                            </c:if>--%>
-            <%--                        </c:if>--%>
-            <%--                    </c:if>--%>
-            <%--                </c:if>--%>
-            <%--                <c:if test="${shopOrder.orderArchiveId ne null}">--%>
-            <%--                    <a href="${ctx}/archive/cmOrderArchive/form?id=${shopOrder.orderArchiveId}">查看订单资料</a>--%>
-            <%--                </c:if>--%>
-            <%--            </div>--%>
-            <%--        </c:if>--%>
-            <%--        <c:if test="${order.onlinePayFlag eq 0}">--%>
         <br/>
-        <span>商品总额：<fmt:formatNumber value="${shopOrder.needPayAmount}" type="currency"/></span>
+        <span>商品总额：<fmt:formatNumber value="${shopOrder.productAmount}" type="currency"/></span>
         <span>运费：
-                <c:if test="${order.organizeID != 4}">
-                    <c:if test="${order.freePostFlag == 0}">
-                        包邮
-                    </c:if>
-                    <c:if test="${order.freePostFlag == -1}">
-                        到付
-                    </c:if>
-                    <c:if test="${order.freePostFlag == -2}">
-                        仪器到付-产品包邮
-                    </c:if>
-                    <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
-                        <fmt:formatNumber value="${order.freight}" type="currency"/>
-                    </c:if>
-                    <c:if test="${order.userBeans > 0}">
-                        <font color="red">（采美豆抵用：${order.userBeans}）</font>
-                    </c:if>
-                </c:if>
-                <c:if test="${order.organizeID == 4}">
-                    <%--                    ${postageInfo}--%>
                     ${shopOrder.postageInfo}
-                </c:if>
             </span>
         <span>子订单总额：<fmt:formatNumber value="${shopOrder.totalAmount}" type="currency"/></span>
         <span>优惠：<fmt:formatNumber value="${shopOrder.eachDiscount}" type="currency"/></span>

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -1138,6 +1138,12 @@
                 if (includedTax != ${product.includedTax} || invoiceType != ${product.invoiceType}) {
                     top.$.jBox.confirm("目前含税信息为：${product.includedTax eq 0?'不含税':product.includedTax eq 1?'含税':'未知'}${product.includedTax eq 2?'':product.invoiceType eq 1?'-开增值税专用发票':product.invoiceType eq 2?'-开增值税普通发票':'不开发票'}，确定修改为：" + (includedTax == 0 ? '不含税' : includedTax == 1 ? '含税' : '未知') + (includedTax == 2 ? '' : invoiceType == 1 ? '-开增值税专用发票' : invoiceType == 2 ? '-开增值税普通发票' : '-不能开票') + "吗？", '保存商品提示', function (v, h, f) {
                         if (v == 'ok') {
+                            if(!$('#caimei').prop('checked')){
+                                $("#groundSkuCaimei").remove()
+                            }
+                            if(!$('#bcc').prop('checked')){
+                                $("#groundSkuBcc").remove()
+                            }
                             // 提交订单
                             loading('正在提交，请稍等...');
                             form.submit();
@@ -1150,6 +1156,12 @@
                         }
                     });
                 } else {
+                    if(!$('#caimei').prop('checked')){
+                        $("#groundSkuCaimei").remove()
+                    }
+                    if(!$('#bcc').prop('checked')){
+                        $("#groundSkuBcc").remove()
+                    }
                     loading('正在提交，请稍等...');
                     form.submit();
                 }
@@ -1994,7 +2006,7 @@
         }
         var product = {
             skuIndex: ++skuIndex-1,
-            costCheckFlag: '1',
+            costCheckFlag: '2',
             ladderPriceFlag: '0'
         }
         setSkuPrototypeValues(current, product, 0);
@@ -2012,7 +2024,7 @@
         }
         var product = {
             skuIndex: ++skuIndex-1,
-            costCheckFlag: '1',
+            costCheckFlag: '2',
             ladderPriceFlag: '0'
         }
         setSkuPrototypeValues(current, product, 4);
@@ -2154,6 +2166,9 @@
             ladderPriceBox.show();
             minBuyNumber.parent('.sku-minBuyNumber').hide();
         }
+        if (organize != 0) {
+            ladderPriceFlag.parent().hide();
+        }
 
         ladderPriceBox.find('.ladderPrice').each(function (index, item) {
             var ladderPrice = {}

src/main/webapp/WEB-INF/views/modules/product-new/productList.jsp

@@ -433,7 +433,7 @@
             </div>
             <div class="item">
                 <label>上架平台：</label>
-                <form:select path="isRelevance" class="input-medium">
+                <form:select path="groundMall" class="input-medium">
                     <form:option value="" label="请选择"/>
                     <form:option value="0" label="【采美】平台"/>
                     <form:option value="4" label="【丽格集采联盟】平台"/>

src/main/webapp/WEB-INF/views/modules/product/productForm.jsp

@@ -51,12 +51,12 @@
 				<form:input path="tinyTypeID" htmlEscape="false" maxlength="11" class="input-xlarge "/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">selfTypeID：</label>
-			<div class="controls">
-				<form:input path="selfTypeID" htmlEscape="false" maxlength="11" class="input-xlarge "/>
-			</div>
-		</div>
+<%--		<div class="control-group">--%>
+<%--			<label class="control-label">selfTypeID：</label>--%>
+<%--			<div class="controls">--%>
+<%--				<form:input path="selfTypeID" htmlEscape="false" maxlength="11" class="input-xlarge "/>--%>
+<%--			</div>--%>
+<%--		</div>--%>
 		<div class="control-group">
 			<label class="control-label">所属供应商Id：</label>
 			<div class="controls">
@@ -249,12 +249,12 @@
 				<form:input path="sellNumber" htmlEscape="false" maxlength="11" class="input-xlarge "/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">weekSellNumber：</label>
-			<div class="controls">
-				<form:input path="weekSellNumber" htmlEscape="false" maxlength="11" class="input-xlarge "/>
-			</div>
-		</div>
+<%--		<div class="control-group">--%>
+<%--			<label class="control-label">weekSellNumber：</label>--%>
+<%--			<div class="controls">--%>
+<%--				<form:input path="weekSellNumber" htmlEscape="false" maxlength="11" class="input-xlarge "/>--%>
+<%--			</div>--%>
+<%--		</div>--%>
 		<div class="control-group">
 			<label class="control-label">beforeValidFlag：</label>
 			<div class="controls">

src/test/java/com/caimei/info/InfoTest.java

@@ -2,6 +2,7 @@ package com.caimei.info;
 
 import com.caimei.modules.coupon.dao.CmCouponVipDao;
 import com.caimei.modules.coupon.entity.CmVipCoupon;
+import com.caimei.modules.product.dao.CmOrganizeProductInfoMapper;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -20,6 +21,8 @@ public class InfoTest extends SpringTransactionalContextTests {
 
 	@Autowired
 	private InfomationService infomationService;
+	@Autowired
+	CmOrganizeProductInfoMapper cmOrganizeProductInfoMapper;
 
 	@Autowired
 	private InfoService infoService;
@@ -29,14 +32,15 @@ public class InfoTest extends SpringTransactionalContextTests {
 
 	@Test
 	public void test(){
-		String str = "/pages/goods/goods-classify?classType=2&id=1038&title=%E7%8E%BB%E5%B0%BF%E9%85%B8%EF%BC%88%E5%B0%8F%E5%88%86%E5%AD%90%EF%BC%89";
-		String decode="";
-		try {
-			decode = java.net.URLDecoder.decode(str,"UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-		System.out.println(decode);
+		cmOrganizeProductInfoMapper.getCmOrganizeProductInfoList(null);
+//		String str = "/pages/goods/goods-classify?classType=2&id=1038&title=%E7%8E%BB%E5%B0%BF%E9%85%B8%EF%BC%88%E5%B0%8F%E5%88%86%E5%AD%90%EF%BC%89";
+//		String decode="";
+//		try {
+//			decode = java.net.URLDecoder.decode(str,"UTF-8");
+//		} catch (UnsupportedEncodingException e) {
+//			e.printStackTrace();
+//		}
+//		System.out.println(decode);
 //		Info info = infoService.get("228");
 //		String infoContent=Encodes.unescapeHtml(info.getInfoContent());
 //		//infoContent=Encodes.urlDecode(infoContent);