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

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsSalesWVO.java

@@ -72,7 +72,7 @@ public class WebsitPartsSalesWVO {
     @ApiModelProperty("支付状态")
     private PartsPayFlagEnum payFlag;
 
-    @ZfireField(hide = true)
+    @ZfireField(hide = true, ignoreSelect = true)
     @ApiModelProperty("网点提货标识0-可提货 1-不可提货")
     private Integer deliveryConfirmFlag;
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebitPartsOldStockLogic.java

@@ -78,6 +78,8 @@ public class WebitPartsOldStockLogic {
     public void delOldOutStock(WebsitPartsOldOutRecord outRecord) throws Exception {
         // 发出
         WebsitStockDTO sendShopStockDTO = new WebsitStockDTO();
+        sendShopStockDTO.setCompanyWechatId(outRecord.getCompanyWechatId());
+        sendShopStockDTO.setCompanyWechatName(outRecord.getCompanyWechatName());
         sendShopStockDTO.setWebsitId(outRecord.getSendWebsitId());
         sendShopStockDTO.setWebsitName(outRecord.getSendWebsitName());
         sendShopStockDTO.setSdate(outRecord.getCreateTime());

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsConfigLogic.java

@@ -50,6 +50,7 @@ public class WebsitPartsConfigLogic {
                     .one();
 
             WebsitPartsConfigVO vo = new WebsitPartsConfigVO();
+            vo.setId(refundConfig.getId());
             vo.setCompanyWechatId(adminUser.getCompanyWechatId());
             vo.setCompanyWechatName(adminUser.getCompanyName());
             vo.setOldRefund(refundConfig.getOldRefund());

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsOldOutLogic.java

@@ -241,6 +241,7 @@ public class WebsitPartsOldOutLogic {
                     .setObjectType(objectType)
                     .setPartsNumber(partsNumber)
                     .setPartsName(parts.getGoodsName())
+                    .setMaterialGroupName(parts.getMaterialGroupName())
                     .setGoodsStockUnit(parts.getGoodsStockUnit())
                     .setPrice(new BigDecimal(StringUtils.isNotBlank(priceStr) ? priceStr : "0"))
                     .setQty(new BigDecimal(StringUtils.isNotBlank(qtyStr) ? qtyStr : "0"))