Merge branch 'zx_saas_goods' of http://git.dayaedu.com/yonge/mec into test

mec-application/src/main/java/com/ym/mec/web/controller/APIController.java

@@ -12,12 +12,7 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.biz.service.impl.GoodsServiceImpl;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.dto.SchoolDto;
-import com.ym.mec.common.entity.GoodsSubModel;
-import com.ym.mec.common.entity.GoodsSubStockModel;
-import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.entity.MallCreateOrderModel;
-import com.ym.mec.common.entity.OrderCancelModel;
-import com.ym.mec.common.entity.RefundModel;
+import com.ym.mec.common.entity.*;
 import com.ym.mec.thirdparty.adapay.entity.BaseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -172,8 +167,8 @@ public class APIController extends BaseController {
 
 	// 同步商城订单发货状态
 	@PostMapping("/updateShippedStatus")
-	public HttpResponseResult updateShippedStatus(@RequestBody List<String> orderNo) throws Exception {
-		studentPaymentOrderService.updateShippedStatus(orderNo);
+	public HttpResponseResult updateShippedStatus(@RequestBody List<OrderSkuSync> orderSkuSyncs) throws Exception {
+		studentPaymentOrderService.updateShippedStatus(orderSkuSyncs);
 		return succeed();
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SellOrderDao.java

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
 import com.ym.mec.biz.dal.entity.OperatingReport;
 import com.ym.mec.biz.dal.entity.SellOrder;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.OrderSkuSync;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -243,4 +244,6 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
     List<String> getMallProductCategory(@Param("database") String database);
 
     void updateShippedStatus(@Param("orderNos") List<String> orderNos);
+
+    void updateOrganGoodsCost(@Param("orderSkuSync") OrderSkuSync orderSkuSync);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderService.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.common.entity.OrderSkuSync;
 import org.apache.ibatis.annotations.Param;
 
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
@@ -276,5 +277,5 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
     List<OperatingTotalIncomeDto> queryOperatingSummaryIncome(Map<String, Object> params);
 
     //商品已发货
-    void updateShippedStatus(List<String> orderNo);
+    void updateShippedStatus(List<OrderSkuSync> orderSkuSyncs);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/GoodsServiceImpl.java

@@ -57,6 +57,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.PictureData;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +76,7 @@ import java.awt.image.BufferedImage;
 import java.io.*;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -604,8 +607,13 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public String importGoodsV2(MultipartFile file, Integer userId) throws Exception {
+		File excel = createImportGoodsTempFile(UUID.randomUUID().toString().replaceAll("-","") + ".xlsx");
+		Workbook workbook = WorkbookFactory.create(file.getInputStream());
+		workbook.write(Files.newOutputStream(excel.toPath()));
+
 		List<String> errList = new ArrayList<>();
-		Map<String, List<Map<String, Object>>> sheetsListMap = POIUtil.importExcel(new ByteArrayInputStream(file.getBytes()), 2, file.getOriginalFilename());
+//		Map<String, List<Map<String, Object>>> sheetsListMap = POIUtil.importExcel(new ByteArrayInputStream(file.getBytes()), 2, file.getOriginalFilename());
+		Map<String, List<Map<String, Object>>> sheetsListMap = POIUtil.importExcel(excel, 2);
 		if (sheetsListMap.values().isEmpty()) {
 			errList.add("excel未解析到数据");
 			return getExportErrLogFile(errList);
@@ -733,7 +741,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 								if (data instanceof PictureData) {
 									value = ((PictureData) data).getData();
 								}
-							} else {
+							} else if (!(value instanceof byte[])) {
 								lineErrList.add("图片格式错误");
 								continue;
 							}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderServiceImpl.java

@@ -582,20 +582,21 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         //获取商品采购信息
         result.put("goods",musicGroupPaymentCalenderGoodsService.lambdaQuery().eq(MusicGroupPaymentCalenderGoods::getCalenderId,calenderId).list());
         MusicGroupPaymentCalenderAddress one = musicGroupPaymentCalenderAddressService.lambdaQuery().eq(MusicGroupPaymentCalenderAddress::getCalenderId, calenderId).one();
-        MusicGroupPaymentCalenderAddressWrapper.MusicGroupPaymentCalenderAddress musicGroupPaymentCalenderAddress = JSON
-            .parseObject(JSON.toJSONString(one), MusicGroupPaymentCalenderAddressWrapper.MusicGroupPaymentCalenderAddress.class);
-
-        // 查询地区信息
-        List<String> areaIds = new ArrayList<>();
-        areaIds.add(one.getProvince());
-        areaIds.add(one.getCity());
-        areaIds.add(one.getRegion());
-        areaIds = areaIds.stream().filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
-        Map<String, String> nameMapByIds = sysAreaService.getNameMapByIds(areaIds);
-        musicGroupPaymentCalenderAddress.setProvinceName(nameMapByIds.getOrDefault(one.getProvince(),""));
-        musicGroupPaymentCalenderAddress.setCityName(nameMapByIds.getOrDefault(one.getCity(),""));
-        musicGroupPaymentCalenderAddress.setRegionName(nameMapByIds.getOrDefault(one.getRegion(),""));
-        result.put("address", musicGroupPaymentCalenderAddress);
+        if(Objects.nonNull(one)){
+            MusicGroupPaymentCalenderAddressWrapper.MusicGroupPaymentCalenderAddress musicGroupPaymentCalenderAddress = JSON
+                    .parseObject(JSON.toJSONString(one), MusicGroupPaymentCalenderAddressWrapper.MusicGroupPaymentCalenderAddress.class);
+            // 查询地区信息
+            List<String> areaIds = new ArrayList<>();
+            areaIds.add(one.getProvince());
+            areaIds.add(one.getCity());
+            areaIds.add(one.getRegion());
+            areaIds = areaIds.stream().filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
+            Map<String, String> nameMapByIds = sysAreaService.getNameMapByIds(areaIds);
+            musicGroupPaymentCalenderAddress.setProvinceName(nameMapByIds.getOrDefault(one.getProvince(),""));
+            musicGroupPaymentCalenderAddress.setCityName(nameMapByIds.getOrDefault(one.getCity(),""));
+            musicGroupPaymentCalenderAddress.setRegionName(nameMapByIds.getOrDefault(one.getRegion(),""));
+            result.put("address", musicGroupPaymentCalenderAddress);
+        }
         return result;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SellOrderServiceImpl.java

@@ -593,12 +593,13 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void syncSellOrder2Mall(List<SellOrder> sellOrders, StudentPaymentOrder studentPaymentOrder) {
         List<OrderCreate.OrderItem> orderItems = this.convertMallOrder(sellOrders);
         OrderCreate mallOrder = new OrderCreate();
         mallOrder.setOrderItemList(orderItems);
         mallOrder.setOrchestraId(studentPaymentOrder.getMusicGroupId());
-        mallOrder.setStatus(2);
+        mallOrder.setStatus(1);
         mallOrder.setOrderNo(studentPaymentOrder.getOrderNo());
         mallOrder.setTotalAmount(studentPaymentOrder.getExpectAmount());
         String paymentBusinessChannel = studentPaymentOrder.getPaymentBusinessChannel();

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 import com.ym.mec.biz.service.*;
+import com.ym.mec.common.entity.OrderSkuSync;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -2202,8 +2203,12 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
-    public void updateShippedStatus(List<String> orderNo) {
-        sellOrderDao.updateShippedStatus(orderNo);
+    @Transactional(rollbackFor = Exception.class)
+    public void updateShippedStatus(List<OrderSkuSync> orderSkuSyncs) {
+        for (OrderSkuSync orderSkuSync : orderSkuSyncs) {
+            //更新商品订单成本
+            sellOrderDao.updateOrganGoodsCost(orderSkuSync);
+        }
     }
 
     public BigDecimal getActualAmount(BigDecimal price, StudentPaymentOrderExportDto row) {

mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

@@ -281,6 +281,12 @@
             #{orderNo}
         </foreach>
     </update>
+    <update id="updateOrganGoodsCost">
+        <foreach collection="orderSkuSync.skuSyncList" item="sellOrder" separator=";">
+            update sell_order SET organ_sell_cost_ = #{sellOrder.price} ,delivery_time_ = NOW()
+                              where order_no_ = #{orderSkuSync.orderNo} AND goods_sku_id_ = #{sellOrder.sku}
+        </foreach>
+    </update>
 
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
         insert into sell_order (organ_id_, cooperation_organ_id_, trans_no_,order_id_, order_no_, expect_amount_,

mec-client-api/src/main/java/com/ym/mec/web/WebFeignService.java

@@ -60,8 +60,6 @@ public interface WebFeignService {
 	@PostMapping("/api/cancelOrder")
 	HttpResponseResult<OrderCancelModel> cancelOrder(@RequestParam("orderNo") String orderNo,@RequestParam("reason") String reason);
 
-
-
 	@PostMapping("/api/mallSaveOrderInfo")
 	HttpResponseResult<Map> mallSaveOrderInfo(@RequestBody MallCreateOrderModel model);
 

mec-common/common-core/src/main/java/com/ym/mec/common/dto/PmsProductDto.java

@@ -40,9 +40,6 @@ public class PmsProductDto implements Serializable {
     private String productCategoryName;
     // 商品图片
     private String pic;
-    // 商品详情
-    private String detailHtml;
-
 
     //"商品销售属性，json格式"
     private String spData;

mec-mall/mall-admin/src/main/resources/config/mybatis/PmsProductDao.xml

@@ -126,7 +126,6 @@
         t.brand_id as brandId,
         t.product_category_id as productCategoryId,
         t.pic as pic,
-        t.detail_html as detailHtml,
         t1.sp_data as spData
         from pms_product t
         left join pms_sku_stock t1 on t.id = t1.product_id