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

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

@@ -245,5 +245,5 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
 
     void updateShippedStatus(@Param("orderNos") List<String> orderNos);
 
-    void updateOrganGoodsCost(@Param("orderSkuSync") OrderSkuSync orderSkuSync);
+    void updateOrganGoodsCost(@Param("skuSync") OrderSkuSync.SkuSync skuSync, @Param("orderNo") String orderNo);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MusicGroupCalenderRefundPeriodWrapper.java

@@ -51,6 +51,7 @@ public class MusicGroupCalenderRefundPeriodWrapper {
 
         @ApiModelProperty(value = "责任人",required = false)
         private String responsiblePersonName;
+        private String responsiblePersonPhone;
 
         @ApiModelProperty(value = "是否发送回款提醒",required = false)
         private Boolean sendRemind = false;

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

@@ -931,6 +931,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 			Goods goods = JSON.parseObject(JSON.toJSONString(good), Goods.class);
 			goods.setStatus(YesOrNoEnum.NO);
 			goods.setStockCount(stock);
+			goods.setGroupGoods(true);
 			this.insert(goods);
 
 			List<GoodsSub> subList = goodsSubList.stream().map(next -> {

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

@@ -630,6 +630,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                     parseArray.forEach(o -> {
                         if (o.getResponsiblePerson() != null) {
                             o.setResponsiblePersonName(mapByIds.getOrDefault(o.getResponsiblePerson().longValue(),new SysUser()).getRealName());
+                            o.setResponsiblePersonPhone(mapByIds.getOrDefault(o.getResponsiblePerson().longValue(),new SysUser()).getPhone());
                         }
                     });
                 }

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

@@ -736,7 +736,10 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                 }
                 SellOrder sellOrder = new SellOrder();
                 //获取比例
-                BigDecimal ratioAmount = goodsSub.getGoodsPrice().divide(complementPrice, 6, RoundingMode.HALF_UP);
+                BigDecimal ratioAmount = BigDecimal.ZERO;
+                if(complementPrice.compareTo(BigDecimal.ZERO) > 0){
+                    ratioAmount = goodsSub.getGoodsPrice().divide(complementPrice, 6, RoundingMode.HALF_UP);
+                }
                 if (j == goodsSubs.size() - 1){
                     sellOrder.setExpectAmount(subExpectAmount);
                     sellOrder.setBalanceAmount(subGoodsBalance);
@@ -748,7 +751,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                     subExpectAmount = subExpectAmount.subtract(decimal);
                     BigDecimal balance = goodsBalance.multiply(ratioAmount).setScale(2, RoundingMode.HALF_UP);
                     sellOrder.setBalanceAmount(balance);
-                    subGoodsBalance = subGoodsBalance.add(balance);
+                    subGoodsBalance = subGoodsBalance.subtract(balance);
                     BigDecimal actual = actualAmount.multiply(ratioAmount).setScale(2, RoundingMode.HALF_UP);
                     sellOrder.setActualAmount(actual);
                     subActualAmount = subActualAmount.subtract(actual);

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

@@ -2206,8 +2206,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     @Transactional(rollbackFor = Exception.class)
     public void updateShippedStatus(List<OrderSkuSync> orderSkuSyncs) {
         for (OrderSkuSync orderSkuSync : orderSkuSyncs) {
-            //更新商品订单成本
-            sellOrderDao.updateOrganGoodsCost(orderSkuSync);
+            for (int i = 0; i < orderSkuSync.getSkuSyncList().size(); i++) {
+                sellOrderDao.updateOrganGoodsCost(orderSkuSync.getSkuSyncList().get(i), orderSkuSync.getOrderNo());
+            }
         }
     }
 

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

@@ -344,7 +344,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                     mallOrder.setOrderItemList(items);
                     CommonResult<Boolean> result = mallFeignService.productOrderCreate(mallOrder);
                     if (result.getCode() != 200) {
-                        throw new BizException("同步商城订单失败",result.getMessage());
+                        throw new BizException("同步商城订单失败: {}",result.getMessage());
                     }
                 }
             }

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

@@ -282,10 +282,8 @@
         </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 sell_order SET organ_sell_cost_ = #{skuSync.price} ,delivery_time_ = NOW()
+                          where order_no_ = #{orderNo} AND goods_sku_id_ = #{skuSync.sku} AND  organ_sell_cost_ IS NULL
     </update>
 
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">