Merge branch 'master' of hyq/kmall-pt into master

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -697,7 +697,7 @@ public class OrderController {
 
         ExcelExport ee = new ExcelExport("订单信息");
 
-        String[] header = new String[]{"订单编号","商户订单编号", "所属门店", "订单状态", "SKU", "商品名称", "数量", "销售价", "实际支付金额", "保税模式", "快递公司名称", "快递单编号", "海关清单编号", "收货人姓名", "收件人手机", "收件人省份", "收件人城市", "收件人区县", "收件人地址", "下单时间", "支付流水号","身份证号"
+        String[] header = new String[]{"订单编号","商户订单编号", "所属门店", "供应商", "订单状态", "SKU", "商品名称", "数量", "销售价", "实际支付金额", "保税模式", "快递公司名称", "快递单编号", "海关清单编号", "收货人姓名", "收件人手机", "收件人省份", "收件人城市", "收件人区县", "收件人地址", "下单时间", "支付流水号","身份证号"
                 ,"原产国","规格型号","品牌","单位","毛重(kg)","净重"};
 
         List<Map<String, Object>> list = new ArrayList<>();
@@ -710,6 +710,7 @@ public class OrderController {
                 map.put("OrderSn", orderEntity.getOrderSn());
                 map.put("MerchOrderSn", orderEntity.getMerchOrderSn());
                 map.put("StoreName", orderEntity.getStoreName());
+                map.put("SupplierThirdPartyMerchName", orderEntity.getSupplierThirdPartyMerchName());
                 map.put("OrderStatus", StringUtils.isEmpty(orderStatus.toString())? "":Dict.orderStatus.valueOf("item_"+ orderStatus).getItemName());
                 map.put("SKU", orderEntity.getSku());
                 map.put("GoodsName", orderEntity.getGoodsName());

kmall-admin/src/main/java/com/kmall/admin/entity/OrderEntity.java

@@ -192,6 +192,17 @@ public class OrderEntity implements Serializable {
 
     private String campName;
 
+    //供应商第三方商户
+    private String supplierThirdPartyMerchName;
+
+    public String getSupplierThirdPartyMerchName() {
+        return supplierThirdPartyMerchName;
+    }
+
+    public void setSupplierThirdPartyMerchName(String supplierThirdPartyMerchName) {
+        this.supplierThirdPartyMerchName = supplierThirdPartyMerchName;
+    }
+
     public Integer getCampMinusId() {
         return campMinusId;
     }

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -335,17 +335,19 @@ public class GoodsServiceImpl implements GoodsService {
         if (galleryEntityList == null || galleryEntityList.size() <= 0) {
             throw new RRException("至少保留一张商品轮播图！");
         }
-        Integer goodsNumber = goods.getGoodsNumber();//商品总库存
-        Integer storeTotalGoodsNumber = 0;//商品分配库存
         List<ProductStoreRelaEntity> proStoreList = productStoreRelaDao.queryByGoodsId(goodsEntity.getId());
         Long[] storeIds = new Long[proStoreList.size()];
-        for(int i = 0; i < proStoreList.size(); i++){
-            ProductStoreRelaEntity relaEntity = proStoreList.get(i);
-            storeTotalGoodsNumber = storeTotalGoodsNumber + relaEntity.getStockNum();
-            storeIds[i] = relaEntity.getStoreId();
-        }
-        if(goodsNumber < storeTotalGoodsNumber){
-            throw new RRException("该商品已在各门店分配库存"+storeTotalGoodsNumber+"，当前商品总库存不能小于分配库存总额！请先修改门店库存！");
+        if(goodsEntity.getIsStockShare().equalsIgnoreCase(Dict.isStockShare.item_0.getItem())) {
+            Integer goodsNumber = goods.getGoodsNumber();//商品总库存
+            Integer storeTotalGoodsNumber = 0;//商品分配库存
+            for (int i = 0; i < proStoreList.size(); i++) {
+                ProductStoreRelaEntity relaEntity = proStoreList.get(i);
+                storeTotalGoodsNumber = storeTotalGoodsNumber + relaEntity.getStockNum();
+                storeIds[i] = relaEntity.getStoreId();
+            }
+            if (goodsNumber < storeTotalGoodsNumber) {
+                throw new RRException("该商品已在各门店分配库存" + storeTotalGoodsNumber + "，当前商品总库存不能小于分配库存总额！请先修改门店库存！");
+            }
         }
 
         List<GoodsEntity> prodbarGoodsList = goodsDao.queryObjectByProdBarcode(goods.getProdBarcode(),goods.getMerchSn(),goods.getId());

kmall-admin/src/main/resources/mybatis/mapper/GoodsDao.xml

@@ -241,6 +241,16 @@
             store_id = #{storeId}
             )
         </if>
+        <if test="storeIdBySupplier != null and storeIdBySupplier != ''">
+            AND mall_goods.id NOT IN (
+            SELECT
+            goods_id
+            FROM
+            mall_product_store_rela pp
+            WHERE
+            store_id = #{storeIdBySupplier} and supplier_third_id = #{thirdMerchSn}
+            )
+        </if>
 
         <choose>
             <when test="sidx != null and sidx.trim() != ''">

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -108,7 +108,7 @@
     </select>
 
     <select id="queryList" resultType="com.kmall.admin.entity.OrderEntity">
-        SELECT
+        SELECT DISTINCT
         o.order_sn,
         o.merch_order_sn,
         o.order_status,
@@ -145,6 +145,11 @@
         LEFT JOIN mall_user u ON o.user_id = u.id
         LEFT JOIN mall_order_process_record p ON o.order_sn = p.order_sn
         left join mall_store s on o.store_id = s.id
+        LEFT JOIN third_merchant_biz t ON t.third_party_merch_code = s.third_party_merch_code
+        LEFT JOIN mall_order_goods g ON o.id = g.order_id
+        LEFT JOIN mall_product_store_rela r ON o.store_id = r.store_id
+        AND r.goods_id = g.goods_id
+        LEFT JOIN mall_goods gs ON g.goods_id = gs.id
         WHERE 1=1
         <if test="startTime != null and startTime != ''">
             AND o.add_time <![CDATA[ >  ]]> #{startTime}
@@ -156,11 +161,17 @@
             AND o.store_id = #{storeId}
         </if>
         <if test="sku != null and sku.trim() != ''">
-            AND o.id IN ( SELECT order_id FROM mall_order_goods g INNER JOIN mall_goods gs ON g.goods_id = gs.id WHERE gs.sku = #{sku} )
+            AND gs.sku = #{sku}
         </if>
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
+        <if test="thirdMerchSn != null and thirdMerchSn != ''">
+            AND t.third_merch_sn = #{thirdMerchSn}
+        </if>
+        <if test="supplierThirdId != null and supplierThirdId != ''">
+            AND r.supplier_third_id = #{supplierThirdId}
+        </if>
         <if test="orderBizType != null and orderBizType != ''">
             AND o.order_biz_type = #{orderBizType}
         </if>
@@ -241,7 +252,8 @@
         good.brand,
         uc.NAME unit_code,
         good.gross_weight * g.number gross_weight,
-        good.net_weight * g.number net_weight
+        good.net_weight * g.number net_weight,
+        t2.third_party_merch_name 'supplierThirdPartyMerchName'
         FROM
         mall_order o
         LEFT JOIN mall_user u ON o.user_id = u.id
@@ -251,6 +263,10 @@
         LEFT JOIN mall_goods good ON good.id = g.goods_id
         LEFT JOIN sys_cus_nation_code nc ON nc.CODE = good.ori_cnt_code
         LEFT JOIN sys_cus_unit_code uc ON uc.CODE = good.unit_code
+        LEFT JOIN third_merchant_biz t ON t.third_party_merch_code = s.third_party_merch_code
+        LEFT JOIN mall_product_store_rela r ON o.store_id = r.store_id
+        AND r.goods_id = g.goods_id
+        LEFT JOIN third_merchant_biz t2 ON t2.third_merch_sn = r.supplier_third_id
         WHERE
         1 =1
         <if test="startTime != null and startTime != ''">
@@ -269,11 +285,17 @@
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
         <if test="sku != null and sku.trim() != ''">
-            AND o.id IN ( SELECT order_id FROM mall_order_goods g INNER JOIN mall_goods gs ON g.goods_id = gs.id WHERE gs.sku = #{sku} )
+            AND good.sku = #{sku}
         </if>
         <if test="merchOrderSn != null and merchOrderSn.trim() != ''">
             AND o.merch_order_sn = #{merchOrderSn}
         </if>
+        <if test="thirdMerchSn != null and thirdMerchSn != ''">
+            AND t.third_merch_sn = #{thirdMerchSn}
+        </if>
+        <if test="supplierThirdId != null and supplierThirdId != ''">
+            AND r.supplier_third_id = #{supplierThirdId}
+        </if>
         <if test="merchSn != null and merchSn.trim() != ''">
             AND o.merch_sn = #{merchSn}
         </if>
@@ -315,8 +337,17 @@
     </select>
 
     <select id="queryTotal" resultType="int">
-        select count(*) from mall_order o
-        left join mall_store s on o.store_id = s.id WHERE 1=1
+        select count(DISTINCT o.id) FROM
+        mall_order o
+        LEFT JOIN mall_user u ON o.user_id = u.id
+        LEFT JOIN mall_order_process_record p ON o.order_sn = p.order_sn
+        left join mall_store s on o.store_id = s.id
+        LEFT JOIN third_merchant_biz t ON t.third_party_merch_code = s.third_party_merch_code
+        LEFT JOIN mall_order_goods g ON o.id = g.order_id
+        LEFT JOIN mall_product_store_rela r ON o.store_id = r.store_id
+        AND r.goods_id = g.goods_id
+        LEFT JOIN mall_goods gs ON g.goods_id = gs.id
+        WHERE 1=1
         <if test="startTime != null and startTime != ''">
             AND o.add_time <![CDATA[ >  ]]> #{startTime}
         </if>
@@ -326,18 +357,24 @@
         <if test="storeId != null and storeId != ''">
             AND o.store_id = #{storeId}
         </if>
+        <if test="sku != null and sku.trim() != ''">
+            AND gs.sku = #{sku}
+        </if>
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
+        <if test="thirdMerchSn != null and thirdMerchSn != ''">
+            AND t.third_merch_sn = #{thirdMerchSn}
+        </if>
+        <if test="supplierThirdId != null and supplierThirdId != ''">
+            AND r.supplier_third_id = #{supplierThirdId}
+        </if>
         <if test="orderBizType != null and orderBizType != ''">
             AND o.order_biz_type = #{orderBizType}
         </if>
         <if test="merchOrderSn != null and merchOrderSn.trim() != ''">
             AND o.merch_order_sn = #{merchOrderSn}
         </if>
-        <if test="sku != null and sku.trim() != ''">
-            AND o.id IN ( SELECT order_id FROM mall_order_goods g INNER JOIN mall_goods gs ON g.goods_id = gs.id WHERE gs.sku = #{sku} )
-        </if>
         <if test="merchSn != null and merchSn.trim() != ''">
             AND o.merch_sn = #{merchSn}
         </if>

kmall-admin/src/main/webapp/WEB-INF/page/shop/order.html

@@ -10,6 +10,11 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="3">
+                    <i-select v-model="q.thirdMerchSn" placeholder="第三方商户" filterable label-in-value>
+                        <i-option v-for="thirdMerchant in thirdMerchantBizList" :value="thirdMerchant.thirdMerchSn" :key="thirdMerchant.thirdMerchSn">{{thirdMerchant.thirdPartyMerchName}}</i-option>
+                    </i-select>
+                </i-col>
+                <i-col span="3">
                     <i-select v-model="q.storeId" placeholder="门店" filterable label-in-value>
                         <i-option v-for="store in stores" :value="store.id"
                                   :key="store.id">{{store.storeName}}
@@ -17,6 +22,11 @@
                     </i-select>
                 </i-col>
                 <i-col span="3">
+                    <i-select v-model="q.supplierThirdId" placeholder="所属供应商三方商户" filterable label-in-value>
+                        <i-option v-for="thirdMerchant in supplierThirdMerchantBizList" :value="thirdMerchant.thirdMerchSn" :key="thirdMerchant.thirdMerchSn">{{thirdMerchant.thirdPartyMerchName}}</i-option>
+                    </i-select>
+                </i-col>
+                <i-col span="3">
                     <i-input v-model="q.orderSn" @on-enter="query" placeholder="订单号"/>
                 </i-col>
                 <i-col span="3">
@@ -25,21 +35,21 @@
                 <i-col span="3">
                     <i-input v-model="q.sku" @on-enter="query" placeholder="sku"/>
                 </i-col>
-                <i-col span="2">
+                <i-col span="3">
                     <i-select v-model="q.orderBizType" placeholder="货品业务类型">
                         <i-option v-for="macro in orderBizTypeList" :value="macro.value" :key="macro.id">{{macro.name}}
                         </i-option>
                         <!--<i-option value="402">完成</i-option>-->
                     </i-select>
                 </i-col>
-                <i-col span="2">
+                <i-col span="3">
                     <i-select v-model="q.orderStatus" placeholder="订单状态">
                         <i-option v-for="macro in orderStatusList" :value="macro.value" :key="macro.id">{{macro.name}}
                         </i-option>
                         <!--<i-option value="402">完成</i-option>-->
                     </i-select>
                 </i-col>
-                <i-col span="2">
+                <i-col span="3">
                     <i-select v-model="q.payStatus" placeholder="支付状态">
                         <i-option v-for="macro in payStatusList" :value="macro.value" :key="macro.id">{{macro.name}}
                         </i-option>
@@ -51,48 +61,50 @@
                         <i-option value="2">团购订单</i-option>
                     </i-select>
                 </i-col>-->
-                <i-col span="2">
+                <i-col span="3">
                     <Date-picker v-model="q.startTime" placeholder="创建订单开始时间"/>
                 </i-col>
-                <i-col span="2">
+                <i-col span="3">
                     <Date-picker v-model="q.endTime" placeholder="创建订单结束时间"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
-            <div class="buttons-group" style="float: left">
-                #if($shiro.hasPermission("order:export"))
-                <i-button type="primary" @click="exportOrder"><i class="fa fa-cloud-download"></i>&nbsp;导出</i-button>
-                #end
-                #if($shiro.hasPermission("order:getProcess"))
-                <i-button type="success" @click="getProcess">查看清关信息</i-button>
-                #end
-                #if($shiro.hasPermission("order:getLogistics"))
-                <i-button type="warning" @click="getLogistics">查看快递信息</i-button>
-                #end
-                #if($shiro.hasPermission("order:confirm"))
-                <i-button type="error" @click="confirm">确认收货</i-button>
-                #end
-                #if($shiro.hasPermission("shop:comment"))
-                <i-button type="info" @click="openComment">评价</i-button>
-                #end
-                #if($shiro.hasPermission("order:updateExpressInfo"))
-                <i-button type="info" @click="getExpressInfo">修改快递信息</i-button>
-                #end
-                #if($shiro.hasPermission("order:expressUpload"))
-                <i-col style="display: inline-grid;">
-                    <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
-                            :format="['xls','xlsx']"
-                            action="../order/expressUpload">
-                        <i-button type="ghost" icon="ios-cloud-upload-outline">订单快递批量导入</i-button>
-                    </Upload>
-                </i-col>
-                #end
-                #if($shiro.hasPermission("order:down"))
-                &nbsp;&nbsp;&nbsp;&nbsp;
-                <a href="../statics/file/order_express_export_yyyy_mm_dd_v1.0.0.xls">订单快递模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
-                <a href="../statics/file/epress_data.xls">快递公司简写数据下载</a>
-                #end
+            <div>
+                <div class="buttons-group" style="float: left">
+                    #if($shiro.hasPermission("order:export"))
+                    <i-button type="primary" @click="exportOrder"><i class="fa fa-cloud-download"></i>&nbsp;导出</i-button>
+                    #end
+                    #if($shiro.hasPermission("order:getProcess"))
+                    <i-button type="success" @click="getProcess">查看清关信息</i-button>
+                    #end
+                    #if($shiro.hasPermission("order:getLogistics"))
+                    <i-button type="warning" @click="getLogistics">查看快递信息</i-button>
+                    #end
+                    #if($shiro.hasPermission("order:confirm"))
+                    <i-button type="error" @click="confirm">确认收货</i-button>
+                    #end
+                    #if($shiro.hasPermission("shop:comment"))
+                    <i-button type="info" @click="openComment">评价</i-button>
+                    #end
+                    #if($shiro.hasPermission("order:updateExpressInfo"))
+                    <i-button type="info" @click="getExpressInfo">修改快递信息</i-button>
+                    #end
+                    #if($shiro.hasPermission("order:expressUpload"))
+                    <i-col style="display: inline-grid;">
+                        <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                                :format="['xls','xlsx']"
+                                action="../order/expressUpload">
+                            <i-button type="ghost" icon="ios-cloud-upload-outline">订单快递批量导入</i-button>
+                        </Upload>
+                    </i-col>
+                    #end
+                    #if($shiro.hasPermission("order:down"))
+                    &nbsp;&nbsp;&nbsp;&nbsp;
+                    <a href="../statics/file/order_express_export_yyyy_mm_dd_v1.0.0.xls">订单快递模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                    <a href="../statics/file/epress_data.xls">快递公司简写数据下载</a>
+                    #end
+                </div>
             </div>
         </Row>
         <table id="jqGrid"></table>

kmall-admin/src/main/webapp/WEB-INF/page/shop/storeProductStock.html

@@ -269,7 +269,7 @@
                     <i-option v-for="goods in goodss" :value="goods.id" :key="goods.id">{{goods.name}}（{{goods.goodsBizType=='00'?'保税备货':''}}{{goods.goodsBizType=='02'?'保税展示补货':''}}{{goods.goodsBizType=='10'?'门店店提':''}}{{goods.goodsBizType=='11'?'普通货物':''}}）</i-option>
                 </i-select>
             </Form-item>
-            <div v-show="isStockShare"><span style="margin-left: 80px;color: red;font-size: 12px;">* 该门店商品所选供应商第三方商户是共享库存，门店库存则为商户商品总库存，不需要编辑</span></div>
+            <div v-show="isSupplierStockShare"><span style="margin-left: 80px;color: red;font-size: 12px;">* 该门店商品所选供应商第三方商户是共享库存，门店库存则为商户商品总库存，不需要编辑</span></div>
             <Form-item label="库存" prop="stockNum" v-show="isSupplierStockShare"><!--共享-->
                 <Input-number :min="0" :step="1" v-model="productStoreRela.stockNum" placeholder="总库存"
                               style="width: 268px;" disabled/>

kmall-admin/src/main/webapp/js/shop/order.js

@@ -224,7 +224,9 @@ let vm = new Vue({
             storeId: '',
             payStatus:'',
             orderBizType:'',
-            sku: ''
+            sku: '',
+            thirdMerchSn:'',
+            supplierThirdId:''
         },
         refundMoney: 0,
         shipping: {},
@@ -244,7 +246,9 @@ let vm = new Vue({
                 {required: true, message: '名称不能为空', trigger: 'blur'}
             ]*/
         },
-        orderBizTypeList:[]
+        orderBizTypeList:[],
+        thirdMerchantBizList:[],
+        supplierThirdMerchantBizList:[],
     },
     methods: {
         query: function () {
@@ -409,7 +413,9 @@ let vm = new Vue({
                     'storeId': vm.q.storeId,
                     'payStatus': vm.q.payStatus,
                     'orderBizType': vm.q.orderBizType,
-                    'sku': vm.q.sku
+                    'sku': vm.q.sku,
+                    'thirdMerchSn': vm.q.thirdMerchSn,
+                    'supplierThirdId':vm.q.supplierThirdId
                 },
                 page: page
             }).trigger("reloadGrid");
@@ -424,7 +430,9 @@ let vm = new Vue({
                 storeId: '',
                 payStatus: '',
                 orderBizType: '',
-                sku: ''
+                sku: '',
+                thirdMerchSn:'',
+                supplierThirdId:''
             };
         },
         lookDetail: function (rowId) { //第三步：定义编辑操作
@@ -527,7 +535,9 @@ let vm = new Vue({
             var params = {};
             params.orderSn = vm.q.orderSn, params.orderStatus = vm.q.orderStatus, params.merchOrderSn = vm.q.merchOrderSn
                 , params.startTime = vm.q.startTime, params.endTime = vm.q.endTime, params.storeId = vm.q.storeId,params.payStatus = vm.q.payStatus,
-                params.orderBizType = vm.q.orderBizType,params.sku = vm.q.sku;
+                params.orderBizType = vm.q.orderBizType,params.sku = vm.q.sku,
+                params.thirdMerchSn=vm.q.thirdMerchSn,
+                params.supplierThirdId=vm.q.supplierThirdId;
 
             exportFile('#rrapp', '../order/export', params);
             /*$.ajax({
@@ -583,6 +593,12 @@ let vm = new Vue({
         $.get("../sys/macro/queryMacrosByValue?value=goodsBizType", function (r) {
             vm.orderBizTypeList = r.list;
         });
+        $.get("../thirdmerchantbiz/queryAll", function (r) {
+            vm.thirdMerchantBizList = r.list;
+        });
+        $.get("../thirdmerchantbiz/queryAlls", function (r) {
+            vm.supplierThirdMerchantBizList = r.list;
+        });
     }
 });
 

kmall-admin/src/main/webapp/js/shop/storeProductStock.js

@@ -261,6 +261,7 @@ var vm = new Vue({
             vm.storeId = storeId;
             if(storeId){
                 $.get("../store/info/"+storeId, function (r) {
+                    vm.storeId = storeId;
                     vm.thirdPartyMerchCode =  r.store.thirdPartyMerchCode;
                 });
                 vm.categories = [];
@@ -271,9 +272,16 @@ var vm = new Vue({
         },
         getGoodsByThirdMerchSn: function (opt) {
             var thirdMerchSn = opt.value;
-            $.get("../goods/queryAll?thirdMerchSn=" +thirdMerchSn, function (r) {
-                vm.goodss = r.list;
-            });
+            if(vm.isOperator == 'add'){
+                $.get("../goods/queryAll?thirdMerchSn=" +thirdMerchSn+'&storeIdBySupplier='+vm.storeId, function (r) {
+                    vm.goodss = r.list;
+                });
+            }else{
+                var goodsId = vm.goodsId;
+                $.get("../goods/queryAll?thirdMerchSn="+thirdMerchSn+"&id="+goodsId, function (r) {
+                    vm.goodss = r.list;
+                });
+            }
         },
         add: function (event) {
             vm.stockNum = '';
@@ -283,6 +291,7 @@ var vm = new Vue({
             vm.title = "新增";
             vm.isOperator = 'add';
             vm.isOperatorShow = false;
+            vm.isStockShare = false;
             vm.freights = [];
             vm.brands = [];
             vm.categories = [];

kmall-api/src/main/java/com/kmall/api/api/ApiCommentController.java

@@ -83,6 +83,7 @@ public class ApiCommentController extends ApiBaseAction {
         param.put("type_id", typeId);
         param.put("value_id", valueId);
         param.put("orderId", orderId);
+        param.put("store_id", getStoreId());
         Integer allCount = commentService.queryTotal(param);
         Integer hasPicCount = commentService.queryhasPicTotal(param);
         //
@@ -110,6 +111,7 @@ public class ApiCommentController extends ApiBaseAction {
         param.put("type_id", typeId);
         param.put("value_id", valueId);
         param.put("orderId", orderId);
+        param.put("store_id", getStoreId());
         param.put("page", page);
         param.put("limit", size);
         if (StringUtils.isNullOrEmpty(sort)) {

kmall-api/src/main/java/com/kmall/api/api/ApiFootprintController.java

@@ -65,6 +65,8 @@ public class ApiFootprintController extends ApiBaseAction {
         params.put("store_id", storeId);
         params.put("maxFoot", true);
         params.put("order", "desc");
+        params.put("bizType", true);
+        params.put("checkCart", "20");
         Query query = new Query(params);
         List<FootprintVo> footprintVos = footprintService.queryList(query);
         int total = footprintService.queryTotal(query);

kmall-api/src/main/java/com/kmall/api/service/ApiUserCouponService.java

@@ -155,12 +155,14 @@ public class ApiUserCouponService {
                     }
                 }
             }
-            UserCouponVo userCouponVo = new UserCouponVo();
-            userCouponVo.setId(0L);
-            userCouponVo.setCouponName("不参与优惠券");
-            userCouponVo.setTypeMoney(Constant.ZERO);
-            userCouponVo.setGoodsBizType(userCouponDto.getBizType());
-            result.add(userCouponVo);
+            if(result != null && result.size() > 0) {
+                UserCouponVo userCouponVo = new UserCouponVo();
+                userCouponVo.setId(0L);
+                userCouponVo.setCouponName("不参与优惠券");
+                userCouponVo.setTypeMoney(Constant.ZERO);
+                userCouponVo.setGoodsBizType(userCouponDto.getBizType());
+                result.add(userCouponVo);
+            }
         }
         return result;
     }

kmall-api/src/main/java/com/kmall/api/service/mk/ApiMkStoreCampMinusService.java

@@ -275,28 +275,56 @@ public class ApiMkStoreCampMinusService {
      */
     private void getResultByCheckPieceConf(MkStoreCampMinusVo minusVo,List<CartVo> cartVoList,
                                            Integer pieceConf, BigDecimal money, List<CampMinusDto> result,List<MkStoreCampMinusVo> switchList){
-        if(minusVo.getApplyType().equalsIgnoreCase(Dict.applyType.item_00.getItem())){//全部商品参与
-            //计算购物车中满足部分商品的销售价
-            BigDecimal totalByGoodsId = getTotalByGoodsId(cartVoList, minusVo);
-            //计算购物车中满足部分商品的件数
-            Integer pieceByGoodsId = getPieceByGoodsId(cartVoList, minusVo);
-            //购物车中件数>满减件，去重
-            if (pieceByGoodsId.compareTo(pieceConf) >= 0 && totalByGoodsId.compareTo(money) > 0 && containsList(switchList,minusVo)) {
-                CampMinusDto campMinusDto = setCampMinus(minusVo, money);
-                result.add(campMinusDto);
-                switchList.add(minusVo);
+        if(minusVo.getCampMinusType().equalsIgnoreCase(Dict.campMinusType.item_01.getItem())) {
+            if (minusVo.getApplyType().equalsIgnoreCase(Dict.applyType.item_00.getItem())) {//全部商品参与
+                //计算购物车中满足部分商品的销售价
+                BigDecimal totalByGoodsId = getTotalByGoodsId(cartVoList, minusVo);
+                //计算购物车中满足部分商品的件数
+                Integer pieceByGoodsId = getPieceByGoodsId(cartVoList, minusVo);
+                //购物车中件数>满减件，去重
+                if (pieceByGoodsId.compareTo(pieceConf) >= 0 && totalByGoodsId.compareTo(money) > 0 && containsList(switchList, minusVo)) {
+                    CampMinusDto campMinusDto = setCampMinus(minusVo, money);
+                    result.add(campMinusDto);
+                    switchList.add(minusVo);
+                }
+            }
+            if (!minusVo.getApplyType().equalsIgnoreCase(Dict.applyType.item_00.getItem())) {//部分商品参与
+                //计算购物车中满足部分商品的销售价
+                BigDecimal totalByGoodsId = getTotalByGoodsId(cartVoList, minusVo);
+                //计算购物车中满足部分商品的件数
+                Integer pieceByGoodsId = getPieceByGoodsId(cartVoList, minusVo);
+                //购物车中件数>满减件，去重
+                if (pieceByGoodsId.compareTo(pieceConf) >= 0 && totalByGoodsId.compareTo(money) > 0 && containsList(switchList, minusVo)) {
+                    CampMinusDto campMinusDto = setCampMinus(minusVo, money);
+                    result.add(campMinusDto);
+                    switchList.add(minusVo);
+                }
             }
         }
-        if(!minusVo.getApplyType().equalsIgnoreCase(Dict.applyType.item_00.getItem())) {//部分商品参与
-            //计算购物车中满足部分商品的销售价
-            BigDecimal totalByGoodsId = getTotalByGoodsId(cartVoList, minusVo);
-            //计算购物车中满足部分商品的件数
-            Integer pieceByGoodsId = getPieceByGoodsId(cartVoList, minusVo);
-            //购物车中件数>满减件，去重
-            if(pieceByGoodsId.compareTo(pieceConf) >= 0 && totalByGoodsId.compareTo(money) > 0 && containsList(switchList,minusVo)){
-                CampMinusDto campMinusDto = setCampMinus(minusVo, money);
-                result.add(campMinusDto);
-                switchList.add(minusVo);
+        if(minusVo.getCampMinusType().equalsIgnoreCase(Dict.campMinusType.item_11.getItem())){
+            if (minusVo.getApplyType().equalsIgnoreCase(Dict.applyType.item_00.getItem())) {//全部商品参与
+//                //计算购物车中满足部分商品的销售价
+//                BigDecimal totalByGoodsId = getTotalByGoodsId(cartVoList, minusVo);
+                //计算购物车中满足部分商品的件数
+                Integer pieceByGoodsId = getPieceByGoodsId(cartVoList, minusVo);
+                //购物车中件数>满减件，去重
+                if (pieceByGoodsId.compareTo(pieceConf) >= 0 && containsList(switchList, minusVo)) {
+                    CampMinusDto campMinusDto = setCampMinus(minusVo, money);
+                    result.add(campMinusDto);
+                    switchList.add(minusVo);
+                }
+            }
+            if (!minusVo.getApplyType().equalsIgnoreCase(Dict.applyType.item_00.getItem())) {//部分商品参与
+//                //计算购物车中满足部分商品的销售价
+//                BigDecimal totalByGoodsId = getTotalByGoodsId(cartVoList, minusVo);
+                //计算购物车中满足部分商品的件数
+                Integer pieceByGoodsId = getPieceByGoodsId(cartVoList, minusVo);
+                //购物车中件数>满减件，去重
+                if (pieceByGoodsId.compareTo(pieceConf) >= 0 && containsList(switchList, minusVo)) {
+                    CampMinusDto campMinusDto = setCampMinus(minusVo, money);
+                    result.add(campMinusDto);
+                    switchList.add(minusVo);
+                }
             }
         }
     }

kmall-api/src/main/resources/mybatis/mapper/ApiCommentMapper.xml

@@ -28,10 +28,14 @@
 
     <select id="queryList" resultMap="commentMap">
         select distinct c.* from mall_comment c
+        LEFT JOIN mall_order o ON c.order_id = o.id
         <if test="hasPic != null and hasPic == 1">
             left join mall_comment_picture cp on cp.comment_id = c.id
         </if>
         where 1 = 1 and c.status = 1
+        <if test="store_id != null and store_id != ''">
+            AND o.store_id = #{store_id}
+        </if>
         <if test="type_id != null and type_id != ''">
             and c.type_id = #{type_id}
         </if>
@@ -66,10 +70,14 @@
     <select id="queryTotal" resultType="int">
         select count(c.id)
         from mall_comment c
+        LEFT JOIN mall_order o ON c.order_id = o.id
         <if test="hasPic != null and hasPic == 1">
             left join mall_comment_picture cp on cp.comment_id = c.id
         </if>
         where 1= 1  and c.status = 1
+        <if test="store_id != null and store_id != ''">
+            AND o.store_id = #{store_id}
+        </if>
         <if test="type_id != null and type_id != ''">
             and c.type_id = #{type_id}
         </if>
@@ -92,8 +100,12 @@
 
     <select id="queryhasPicTotal" resultType="int">
         select count(distinct c.id) from mall_comment c
+        LEFT JOIN mall_order o ON c.order_id = o.id
         left join mall_comment_picture cp on cp.comment_id = c.id
         where 1= 1 and cp.id > 0  and c.status = 1
+        <if test="store_id != null and store_id != ''">
+            AND o.store_id = #{store_id}
+        </if>
         <if test="type_id != null and type_id != ''">
             and c.type_id = #{type_id}
         </if>

kmall-api/src/main/resources/mybatis/mapper/ApiFootprintMapper.xml

@@ -61,6 +61,9 @@
                 <if test="checkCart != null and checkCart == '11'">
                     and g.goods_biz_type = '11'
                 </if>
+                <if test="checkCart != null and checkCart == '20'">
+                    and g.goods_biz_type not in ('02','10')
+                </if>
             </if>
             <if test="store_id != null and store_id != ''">
                 and psr.store_id = #{store_id}

wx-mall/pages/cart/cart.wxss

@@ -199,7 +199,7 @@ page {
 .cart-view .item .goods-do {
   position: absolute;
   right: 0;
-  top: 20rpx;
+  top: 23rpx;
   margin-right:-32rpx;
 }
 
@@ -382,7 +382,7 @@ page {
 .cart-bottom .total {
   height: 34rpx;
   flex: 1;
-  font-size: 29rpx;
+  font-size:35rpx;
   color: #b4282d;
   margin-top: -10rpx;
 }

wx-mall/pages/catalog/catalog.wxss

@@ -322,22 +322,23 @@ page {
 }
 
 .cate-item .item .right .goods-do .price {
-  width: 50rpx;
-  display: block;
+  /* width: 50rpx; */
+  /* display: block; */
   color: #b4282d;
   line-height: 50rpx;
-  font-size: 27rpx;
+  font-size:35rpx;
   display: inline;
 }
 
 .cate-item .item .right .goods-do .org-price {
-  width: 40rpx;
-  display: block;
+  /* width: 40rpx; */
+  /* display: block; */
   color: #333;
   line-height: 50rpx;
   font-size: 23rpx;
   display: inline;
   padding-left: 10rpx;
+  margin-left: 16rpx;
 }
 
 .number-item {

wx-mall/pages/goods/goods.wxss

@@ -321,6 +321,7 @@
   color: #303030;
   display: inline;
   text-align: left;
+  margin-left: 16rpx;
 }
 
 .goods-info .brand {

wx-mall/pages/index/index.wxss

@@ -333,7 +333,8 @@
   display: inline;
   color: #b4282d;
   line-height: 50rpx;
-  font-size: 27rpx;
+  font-size:35rpx;
+  /* font-weight: bold; */
 }
 
 .a-popular .b .goods-do .org-price {
@@ -342,6 +343,7 @@
   color: #333;
   line-height: 50rpx;
   font-size: 23rpx;
+  margin-left: 16rpx;
 }
 
 .a-topic .b {

wx-mall/pages/shopping/checkout/checkout.wxml

@@ -116,7 +116,7 @@
             <view class="list-label">商品合计</view>
           </view>
           <view class="list-cell-ft">
-            <text class="txt">共{{goodsTotalByType00}}件商品  总计￥{{goodsTotalPrice00}} 优惠后价格<text style='color:#b4282d;font-size:24rpx'>￥{{actualPrice00}}</text></text>
+            <text class="txt">共{{goodsTotalByType00}}件商品  总计￥{{goodsTotalPrice00}} <text wx:if="{{checkedCoupon00||campMinusDto00}}" class="txt">优惠后价格<text style='color:#b4282d;font-size:24rpx'>￥{{actualPrice00}}</text></text></text>
           </view>
         </view>
         <view class="list-cell" wx:if="{{campMinusDto00.campMinusId > 0}}" bindtap="hideSwitchTicketPop">
@@ -213,7 +213,7 @@
             <view class="list-label">商品合计</view>
           </view>
           <view class="list-cell-ft">
-            <text class="txt">共{{goodsTotalByType02}}件商品  总计￥{{goodsTotalPrice02}} 优惠后价格<text style='color:#b4282d;font-size:24rpx'>￥{{actualPrice02}}</text></text>
+            <text class="txt">共{{goodsTotalByType02}}件商品  总计￥{{goodsTotalPrice02}} <text wx:if="{{checkedCoupon02||campMinusDto02}}" class="txt">优惠后价格<text style='color:#b4282d;font-size:24rpx'>￥{{actualPrice02}}</text></text></text>
           </view>
         </view>
         <view class="list-cell" wx:if="{{campMinusDto02.campMinusId > 0}}" bindtap="hideSwitchTicketPop">
@@ -310,7 +310,7 @@
             <view class="list-label">商品合计</view>
           </view>
           <view class="list-cell-ft">
-            <text class="txt">共{{goodsTotalByType10}}件商品  总计￥{{goodsTotalPrice10}} 优惠后价格<text style='color:#b4282d;font-size:24rpx'>￥{{actualPrice10}}</text></text>
+            <text class="txt">共{{goodsTotalByType10}}件商品  总计￥{{goodsTotalPrice10}} <text wx:if="{{checkedCoupon10||campMinusDto10}}" class="txt">优惠后价格<text style='color:#b4282d;font-size:24rpx'>￥{{actualPrice10}}</text></text></text>
           </view>
         </view>
         <view class="list-cell" wx:if="{{campMinusDto10.campMinusId > 0}}" bindtap="hideSwitchTicketPop">
@@ -380,8 +380,6 @@
             </view>
           </view>
         </view>
-
-
         <!-- 促销、优惠券、总金额、运费start -->
         <view class="list-cell-checked" bindtap="selectCamp" data-goods-type="11" wx:if="{{campList11.length > 0}}">
           <view class="list-cell-checked-bd">
@@ -409,7 +407,7 @@
             <view class="list-label">商品合计</view>
           </view>
           <view class="list-cell-ft">
-            <text class="txt">共{{goodsTotalByType11}}件商品  总计￥{{goodsTotalPrice11}} 优惠后价格<text style='color:#b4282d;font-size:24rpx'>￥{{actualPrice11}}</text></text>
+            <text class="txt">共{{goodsTotalByType11}}件商品  总计￥{{goodsTotalPrice11}} <text wx:if="{{checkedCoupon11||campMinusDto11}}" class="txt">优惠后价格<text style='color:#b4282d;font-size:24rpx'>￥{{actualPrice11}}</text></text></text>
           </view>
         </view>
         <view class="list-cell" wx:if="{{campMinusDto11.campMinusId > 0}}" bindtap="hideSwitchTicketPop">

wx-mall/pages/shopping/checkout/checkout.wxss

@@ -186,7 +186,7 @@ white-space: nowrap;
   line-height: 100rpx;
   color: #b4282d;
   background: #fff;
-  font-size: 33rpx;
+  font-size:35rpx;
   padding-left: 31.25rpx;
   border-top: 1rpx solid rgba(0, 0, 0, 0.2);
   border-bottom: 1rpx solid rgba(0, 0, 0, 0.2);