Merge branch 'master' of http://git.ds-bay.com/project/kmall-haikong

kmall-admin/src/main/java/com/kmall/admin/dto/GoodsDto.java

@@ -134,6 +134,12 @@ public class GoodsDto implements Serializable {
 
     private String firstLevel;
     private String secondLevel;
+    //第一法定单位数量
+    private String legalUnit1Qty;
+    //第二法定单位数量
+    private String legalUnit2Qty;
+    //进口消费税率
+    private String impConsumTaxRate;
 
     //仓库编码
     private String warehouseSn;
@@ -145,6 +151,9 @@ public class GoodsDto implements Serializable {
     private String inventoryType;
     //残品等级（非残次品则不填）
     private String defectiveProductsGrade;
+    //商品重量
+    private String netWeight;
+    private String valueAddedTaxRate;
 
     public String getCounterPrice() {
         return counterPrice;
@@ -652,4 +661,44 @@ public class GoodsDto implements Serializable {
     public void setDefectiveProductsGrade(String defectiveProductsGrade) {
         this.defectiveProductsGrade = defectiveProductsGrade;
     }
+
+    public String getNetWeight() {
+        return netWeight;
+    }
+
+    public void setNetWeight(String netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public String getLegalUnit1Qty() {
+        return legalUnit1Qty;
+    }
+
+    public void setLegalUnit1Qty(String legalUnit1Qty) {
+        this.legalUnit1Qty = legalUnit1Qty;
+    }
+
+    public String getLegalUnit2Qty() {
+        return legalUnit2Qty;
+    }
+
+    public void setLegalUnit2Qty(String legalUnit2Qty) {
+        this.legalUnit2Qty = legalUnit2Qty;
+    }
+
+    public String getImpConsumTaxRate() {
+        return impConsumTaxRate;
+    }
+
+    public void setImpConsumTaxRate(String impConsumTaxRate) {
+        this.impConsumTaxRate = impConsumTaxRate;
+    }
+
+    public String getValueAddedTaxRate() {
+        return valueAddedTaxRate;
+    }
+
+    public void setValueAddedTaxRate(String valueAddedTaxRate) {
+        this.valueAddedTaxRate = valueAddedTaxRate;
+    }
 }

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

@@ -957,7 +957,11 @@ public class GoodsServiceImpl implements GoodsService {
                 goodsEntity.setConsignorSn(goodsDto.getConsignorSn());
                 goodsEntity.setInventoryType(goodsDto.getInventoryType());
                 goodsEntity.setDefectiveProductsGrade(goodsDto.getDefectiveProductsGrade());
-
+                goodsEntity.setNetWeight(new BigDecimal(goodsDto.getNetWeight()));
+                goodsEntity.setLegalUnit1Qty(new BigDecimal(goodsDto.getLegalUnit1Qty()));
+                goodsEntity.setLegalUnit2Qty(new BigDecimal(goodsDto.getLegalUnit2Qty()));
+                goodsEntity.setImpConsumTaxRate(new BigDecimal(goodsDto.getImpConsumTaxRate()));
+                goodsEntity.setValueAddedTaxRate(new BigDecimal(goodsDto.getValueAddedTaxRate()));
 
                 if(!isFail){
                     GoodsEntity goods = goodsDao.queryObjectBySn(goodsDto.getGoodsSn());

kmall-admin/src/main/resources/XmlTemplate/GoodsDtoList.xml

@@ -21,16 +21,21 @@
                 <mapping row="1" col="13">GoodsDto.uniqueIdentifier</mapping>
                 <mapping row="1" col="14">GoodsDto.unitName</mapping>
                 <mapping row="1" col="15">GoodsDto.oriCntName</mapping>
-                <mapping row="1" col="16">GoodsDto.cusDeclEle</mapping>
-                <mapping row="1" col="17">GoodsDto.cusRecCode</mapping>
+                <mapping row="1" col="16">GoodsDto.impConsumTaxRate</mapping>
+
+                <mapping row="1" col="17">GoodsDto.valueAddedTaxRate</mapping>
                 <mapping row="1" col="18">GoodsDto.goodsNumber</mapping>
-                <mapping row="1" col="19">GoodsDto.firstLevel</mapping>
-                <mapping row="1" col="20">GoodsDto.secondLevel</mapping>
-                <mapping row="1" col="21">GoodsDto.warehouseSn</mapping>
-                <mapping row="1" col="22">GoodsDto.consignorSn</mapping>
-                <mapping row="1" col="23">GoodsDto.warehousSysGoodId</mapping>
-                <mapping row="1" col="24">GoodsDto.inventoryType</mapping>
-                <mapping row="1" col="25">GoodsDto.defectiveProductsGrade</mapping>
+
+                <mapping row="1" col="19">GoodsDto.legalUnit1Qty</mapping>
+                <mapping row="1" col="20">GoodsDto.legalUnit2Qty</mapping>
+                <mapping row="1" col="21">GoodsDto.firstLevel</mapping>
+                <mapping row="1" col="22">GoodsDto.secondLevel</mapping>
+                <mapping row="1" col="23">GoodsDto.warehouseSn</mapping>
+                <mapping row="1" col="24">GoodsDto.consignorSn</mapping>
+                <mapping row="1" col="25">GoodsDto.warehousSysGoodId</mapping>
+                <mapping row="1" col="26">GoodsDto.inventoryType</mapping>
+                <mapping row="1" col="27">GoodsDto.defectiveProductsGrade</mapping>
+                <mapping row="1" col="28">GoodsDto.netWeight</mapping>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">

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

@@ -442,7 +442,7 @@ select
 					</if>
 					<if test="item.logisticsNo==null">
 						when order_sn=#{item.orderSn}
-						then mall_order.logistics_no
+						then mall_order.shipping_no
 					</if>
 				</foreach>
 			</trim>

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

@@ -155,39 +155,49 @@
 	</select>
 
 
-	<update id="updateHkNoticeMsgPickUpCode" parameterType="java.util.List">
-		update mall_order
-		<trim prefix="set" suffixOverrides=",">
-
-			<trim prefix="pick_up_code_status =case" suffix="end,">
-				<foreach collection="list" item="item" index="index">
-					<if test="item.clearType!=null and item.clearType=1">
-						when #{item.orderSn}=1
-						then 2
-					</if>
-					<if test="item.clearType!=null and item.clearType=2">
-						when #{item.orderSn}=2
-						then 4
-					</if>
-					<if test="item.clearType!=null and item.clearType=3">
-						when #{item.orderSn}=3
-						then 4
-					</if>
-					<if test="item.clearType!=null and item.clearType=4">
-						when #{item.orderSn}=4
-						then 4
-					</if>
-					<if test="item.clearType==null">
-						when order_sn=#{item.orderSn}
-						then mall_pick_up_code.pick_up_code_status
-					</if>
-				</foreach>
-			</trim>
-
-		</trim>
-		where order_sn in
-		<foreach collection="list" item="item" index="index" separator="," open="(" close=")">
-			#{item.orderSn}
+<!--	<update id="updateHkNoticeMsgPickUpCode" parameterType="java.util.List">-->
+<!--		update mall_pick_up_code-->
+<!--		<trim prefix="set" suffixOverrides=",">-->
+
+<!--			<trim prefix="pick_up_code_status =case" suffix="end,">-->
+<!--				<foreach collection="list" item="item" index="index">-->
+<!--					<if test="item.clearType!=null and item.clearType='1'">-->
+<!--						when 1=#{item.clearType}-->
+<!--						then 2-->
+<!--					</if>-->
+<!--					<if test="item.clearType!=null and item.clearType !='1'">-->
+<!--						when 4=#{item.clearType}-->
+<!--						then 4-->
+<!--					</if>-->
+<!--					<if test="item.clearType==null">-->
+<!--						when order_sn=#{item.orderSn}-->
+<!--						then mall_pick_up_code.pick_up_code_status-->
+<!--					</if>-->
+<!--				</foreach>-->
+<!--			</trim>-->
+
+<!--		</trim>-->
+<!--		where order_sn in-->
+<!--		<foreach collection="list" item="item" index="index" separator="," open="(" close=")">-->
+<!--			#{item.orderSn}-->
+<!--		</foreach>-->
+<!--	</update>-->
+
+	<update id="updateHkNoticeMsgPickUpCode"  parameterType="java.util.List">
+		<foreach collection="list" item="item" index="index" open="" close="" separator=";">
+			update mall_pick_up_code
+			<set>
+				<if test='item.clearType!=null and item.clearType =="1"'>
+					pick_up_code_status=2
+				</if>
+				<if test='item.clearType!=null and item.clearType !="1"'>
+					pick_up_code_status=4
+				</if>
+				<if test='item.clearType==null'>
+					pick_up_code_status=mall_pick_up_code.pick_up_code_status
+				</if>
+			</set>
+			where order_sn = #{item.orderSn}
 		</foreach>
 	</update>
 

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

@@ -10,7 +10,11 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="接口名称"/>
+                    <i-select v-model="q.name" placeholder="请求/响应接口类型"
+                              label-in-value>
+                        <i-option v-for="macro in macros" :value="macro.value" :key="macro.id">{{macro.name}}
+                        </i-option>
+                    </i-select>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

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

@@ -46,6 +46,7 @@ let vm = new Vue({
 	data: {
         showList: true,
         title: null,
+		macros: [],//响应接口类型
 		interfaceSendLog: {},
 		ruleValidate: {
 			name: [
@@ -145,5 +146,11 @@ let vm = new Vue({
         handleReset: function (name) {
             handleResetForm(this, name);
         }
+	},
+	mounted() {
+		$.get("../sys/macro/queryMacrosByValueRuRules?id=85", function (r) {
+			vm.macros = r.list;
+		});
+
 	}
 });