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

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

@@ -1359,7 +1359,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
     	
     	if(musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.DRAFT
                 && musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.REJECT
-        && musicGroupPaymentBaseCalender.getPaymentType() != GOODS_PURCHASE){
+        && musicGroupPaymentCalender.getPaymentType() != GOODS_PURCHASE){
     		throw new BizException("当前缴费项目状态不支持修改");
     	}
     	

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

@@ -496,6 +496,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
     @Transactional(rollbackFor = Exception.class)
     public List<SellOrder> refund(List<SellOrder> sellOrders, Boolean reBackFee) {
         Date nowDate = new Date();
+        String orderNo = sellOrders.get(0).getOrderNo();
         for (SellOrder sellOrder : sellOrders) {
             //1、更改销售列表状态
             sellOrder.setStatus(SellStatus.REFUND);
@@ -523,6 +524,8 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
         }*/
         //4退货同步到商城
         this.mallRefundByOrderId(sellOrders);
+        //5、更改订单状态
+        mallFeignService.productUpdateOrderStatus(orderNo,4);
         return sellOrders;
     }
 

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

@@ -16,7 +16,7 @@
         <result column="specification_" property="specification"/>
         <result column="image_" property="image"/>
         <result column="stock_count_" property="stockCount"/>
-        <result column="tax_stock_count_" property="taxStockCount"/>
+<!--        <result column="tax_stock_count_" property="taxStockCount"/>-->
         <result column="sell_count_" property="sellCount"/>
         <result column="market_price_" property="marketPrice"/>
         <result column="discount_price_" property="discountPrice"/>
@@ -77,12 +77,12 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Goods" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO goods
-        (goods_category_id_,sn_,name_,brand_,specification_,image_,stock_count_,tax_stock_count_,sell_count_,market_price_,
+        (goods_category_id_,sn_,name_,brand_,specification_,image_,stock_count_,sell_count_,market_price_,
          discount_price_,group_purchase_price_,brief_,desc_,is_new_,is_top_,status_,memo_,publish_time_,
          complement_goods_id_list_,update_time_,create_time_,type_,agree_cost_price_,stock_warning_,stock_type_
             ,student_show_organ_id_,education_show_organ_id_,replacement_show_organ_id_,course_fee_show_organ_id_,
          member_fee_show_organ_id_,free_fee_show_organ_id_,tenant_id_,organ_cost_price_,group_goods_)
-        VALUES(#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{taxStockCount},#{sellCount},#{marketPrice},
+        VALUES(#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{sellCount},#{marketPrice},
                #{discountPrice},#{groupPurchasePrice},#{brief},#{desc},
                #{isNew,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isTop,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                #{memo},#{publishTime},#{complementGoodsIdList},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{agreeCostPrice},
@@ -94,7 +94,7 @@
         INSERT INTO goods
         (goods_category_id_,name_,brand_,specification_,image_,market_price_,
         discount_price_,group_purchase_price_,brief_,desc_,update_time_,create_time_,type_,agree_cost_price_,sn_,
-        stock_count_,tax_stock_count_,stock_warning_,stock_type_
+        stock_count_,stock_warning_,stock_type_
         ,student_show_organ_id_,education_show_organ_id_,replacement_show_organ_id_,course_fee_show_organ_id_,
         member_fee_show_organ_id_,free_fee_show_organ_id_,tenant_id_,organ_cost_price_,group_goods_)
         VALUES
@@ -102,7 +102,7 @@
             (#{goods.goodsCategoryId},#{goods.name},#{goods.brand},#{goods.specification},#{goods.image},#{goods.marketPrice},
             #{goods.discountPrice},#{goods.groupPurchasePrice},#{goods.brief},#{goods.desc},now(),now(),
             #{goods.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{goods.agreeCostPrice},#{goods.sn},
-            #{goods.stockCount},#{goods.taxStockCount},
+            #{goods.stockCount},
             #{goods.stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{goods.stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{goods.studentShowOrganId},#{goods.educationShowOrganId},#{goods.replacementShowOrganId},
@@ -186,9 +186,6 @@
             <if test="complementGoodsIdList != null">
                 complement_goods_id_list_ = #{complementGoodsIdList},
             </if>
-            <if test="taxStockCount != null">
-                tax_stock_count_ = #{taxStockCount},
-            </if>
             <if test="stockWarning != null">
                 stock_warning_ = #{stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
@@ -288,9 +285,6 @@
                 <if test="goods.complementGoodsIdList != null">
                     complement_goods_id_list_ = #{goods.complementGoodsIdList},
                 </if>
-                <if test="goods.taxStockCount != null">
-                    tax_stock_count_ = #{goods.taxStockCount},
-                </if>
                 <if test="goods.stockWarning != null">
                     stock_warning_ = #{goods.stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 </if>
@@ -590,7 +584,7 @@
         <where>
             g.status_ != 0
             AND g.type_ = 'INSTRUMENT'
-            AND gc.del_flag_ = 0 and g.tenant_id_ = #{tenantId}
+            AND g.del_flag_ = 0 and g.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(#{organId},g.replacement_show_organ_id_)
             </if>

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

@@ -17,7 +17,7 @@
         </foreach>
     </update>
     <select id="queryChildGoods" resultType="com.ym.mec.biz.dal.dto.ComplementGoodsDto">
-        select sku_ skuStockId,goods_id_ goodsId,goods_price_ organCostPrice,
+        select sku_ skuStockId,goods_id_ goodsId,goods_price_ organCostPrice
         from goods_sub where goods_id_ = #{goodsId}
     </select>
 </mapper>