update 置换乐器换成商品换成商品中商品

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.dto.GoodsSellDto;
 import com.ym.mec.biz.dal.dto.MusicGroupGoodsAndDiscountDto;
 import com.ym.mec.biz.dal.entity.Goods;
+import com.ym.mec.biz.dal.entity.ReplacementInstrument;
 import com.ym.mec.common.dal.BaseDAO;
 
 import org.apache.ibatis.annotations.Param;
@@ -175,7 +176,7 @@ public interface GoodsDao extends BaseDAO<Integer, Goods> {
      *
      * @return
      */
-    List<Goods> getReplacementGoodsPage(Map<String, Object> params);
+    List<ReplacementInstrument> getReplacementGoodsPage(Map<String, Object> params);
 
     /**
      * 获取乐器置换商品总数

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

@@ -13,5 +13,5 @@ public interface ReplacementInstrumentService extends BaseService<Integer, Repla
      * @param queryInfo
      * @return
      */
-    PageInfo<Goods> getPageList(ReplacementInstrumentQueryInfo queryInfo);
+    PageInfo<ReplacementInstrument> getPageList(ReplacementInstrumentQueryInfo queryInfo);
 }

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

@@ -69,6 +69,8 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
     private CooperationOrganService cooperationOrganService;
     @Autowired
     private ReplacementInstrumentCooperationDao replacementInstrumentCooperationDao;
+    @Autowired
+    private GoodsDao goodsDao;
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -84,6 +86,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         if (sysUser == null) {
             throw new BizException("用户信息获取失败，请重新登陆");
         }
+        replacementInstrumentActivity.setGoodsId(replacementInstrumentActivity.getInstrumentsId());
         replacementInstrumentActivity.setUserId(sysUser.getId());
         //如果用户是43分部，那么修改用户信息
         if (sysUser.getOrganId() == 43) {
@@ -117,7 +120,8 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         }
         //已开启缴费推送购买链接
         if (sendPush && replacementInstrumentActivity.getOpenFlag().equals(1) && replacementInstrumentActivity.getInstrumentsId() != null) {
-            ReplacementInstrument replacementInstrument = replacementInstrumentDao.get(replacementInstrumentActivity.getInstrumentsId());
+            //换成商品列表中商品4.25
+            Goods goods = goodsDao.get(replacementInstrumentActivity.getGoodsId());
             Map<Integer, String> userMap = new HashMap<>();
             Map<Integer, String> userPhoneMap = new HashMap<>();
             Integer userId = replacementInstrumentActivity.getUserId();
@@ -125,11 +129,11 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             String pushUrl = baseApiUrl + "/#/questionGoodsSale?id=";
             userMap.put(userId, userId.toString());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.REPLACEMENT_PAY_PUSH,
-                    userMap, null, 0, "5?" + pushUrl + replacementInstrumentActivity.getId(), "STUDENT", replacementInstrument.getBrand(), "");
+                    userMap, null, 0, "5?" + pushUrl + replacementInstrumentActivity.getId(), "STUDENT", goods.getBrand(), "");
 
             userPhoneMap.put(replacementInstrumentActivity.getUserId(), replacementInstrumentActivity.getMobileNo());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.REPLACEMENT_PAY_PUSH,
-                    userPhoneMap, null, 0, null, "STUDENT", replacementInstrument.getBrand(), HttpUtil.getSortUrl(pushUrl + replacementInstrumentActivity.getId()));
+                    userPhoneMap, null, 0, null, "STUDENT", goods.getBrand(), HttpUtil.getSortUrl(pushUrl + replacementInstrumentActivity.getId()));
         }
         return replacementInstrumentActivity;
     }

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

@@ -32,12 +32,12 @@ public class ReplacementInstrumentServiceImpl extends BaseServiceImpl<Integer, R
     }
 
     @Override
-    public PageInfo<Goods> getPageList(ReplacementInstrumentQueryInfo queryInfo) {
-        PageInfo<Goods> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+    public PageInfo<ReplacementInstrument> getPageList(ReplacementInstrumentQueryInfo queryInfo) {
+        PageInfo<ReplacementInstrument> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
 
-        List<Goods> dataList = new ArrayList<>();
+        List<ReplacementInstrument> dataList = new ArrayList<>();
         int count = goodsDao.getReplacementInstrumentCount(params);
 
         if (count > 0) {

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

@@ -446,8 +446,9 @@
     </select>
 
     <!-- 根据分部获取乐器置换的商品-->
-    <select id="getReplacementGoodsPage" resultMap="Goods">
-        SELECT g.*
+    <select id="getReplacementGoodsPage" resultMap="com.ym.mec.biz.dal.dao.ReplacementInstrumentDao.ReplacementInstrument">
+        SELECT g.id_,g.brand_,g.specification_,g.brief_ param_,g.market_price_,g.discount_price_,g.group_purchase_price_ sale_price_,
+        (g.discount_price_-g.group_purchase_price_) depreciation_price_
         FROM subject_goods_mapper sgm
         LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
         <include refid="replacementQuerySql"/>

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

@@ -18,6 +18,7 @@
         <result column="subject_id_" property="subjectId"/>
         <result column="question_result_" property="questionResult"/>
         <result column="instruments_id_" property="instrumentsId"/>
+        <result column="goods_id_" property="goodsId"/>
         <result column="other_suggestion_" property="otherSuggestion"/>
         <result column="open_flag_" property="openFlag"/>
         <result column="pay_status_" property="payStatus"/>
@@ -58,9 +59,9 @@
             keyColumn="id" keyProperty="id">
         INSERT INTO replacement_instrument_activity (cooperation_organ_id_, user_id_, user_name_, grade_, classes_,
                                                      mobile_no_, subject_id_, question_result_, instruments_id_,
-                                                     other_suggestion_, create_time_, update_time_)
+                                                     goods_id_,other_suggestion_, create_time_, update_time_)
         VALUES (#{cooperationOrganId}, #{userId}, #{userName}, #{grade}, #{classes}, #{mobileNo}, #{subjectId},
-                #{questionResult}, #{instrumentsId}, #{otherSuggestion}, NOW(), NOW())
+                #{questionResult}, #{instrumentsId}, #{goodsId}, #{otherSuggestion}, NOW(), NOW())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -92,6 +93,7 @@
                 update_time_ = #{updateTime},
             </if>
             instruments_id_ = #{instrumentsId},
+            goods_id_ = #{goodsId},
             other_suggestion_ = #{otherSuggestion},
             <if test="mobileNo != null">
                 mobile_no_ = #{mobileNo},
@@ -153,10 +155,10 @@
                 AND ria.question_result_ LIKE CONCAT('0', '%')
             </if>
             <if test="brand!=null and brand!=''">
-                AND ri.brand_ = #{brand}
+                AND g.brand_ = #{brand}
             </if>
             <if test="specification!=null and specification!=''">
-                AND ri.specification_ = #{specification}
+                AND g.specification_ = #{specification}
             </if>
             <if test="organId != null">
                 AND FIND_IN_SET(o.id_ , #{organId})
@@ -165,7 +167,8 @@
                 AND (ria.mobile_no_ LIKE CONCAT('%', #{search}, '%') OR ria.user_name_ LIKE CONCAT('%', #{search}, '%'))
             </if>
             <if test="cooperationOrganIdOrName!=null and cooperationOrganIdOrName!=''">
-                AND (ria.cooperation_organ_id_ = #{cooperationOrganIdOrName} OR co.name_ LIKE CONCAT('%', #{cooperationOrganIdOrName}, '%'))
+                AND (ria.cooperation_organ_id_ = #{cooperationOrganIdOrName} OR co.name_ LIKE CONCAT('%',
+                #{cooperationOrganIdOrName}, '%'))
             </if>
             <if test="payStatus!=null">
                 AND ria.pay_status_ = #{payStatus}
@@ -177,11 +180,11 @@
         SELECT
         ria.*,
         sub.name_ subject_name_,
-        ri.brand_,
-        ri.specification_
+        g.brand_,
+        g.specification_
         FROM
         replacement_instrument_activity ria
-        LEFT JOIN replacement_instrument ri ON ria.instruments_id_ = ri.id_
+        LEFT JOIN goods g ON ria.instruments_id_ = g.id_
         LEFT JOIN `subject` sub ON ria.subject_id_ = sub.id_
         <include refid="queryReplacementsCondition"/>
         ORDER BY ria.id_ DESC
@@ -193,7 +196,7 @@
         COUNT(ria.id_)
         FROM
         replacement_instrument_activity ria
-        LEFT JOIN replacement_instrument ri ON ria.instruments_id_ = ri.id_
+        LEFT JOIN goods g ON ria.instruments_id_ = g.id_
         LEFT JOIN `subject` sub ON ria.subject_id_ = sub.id_
         <include refid="queryReplacementsCondition"/>
     </select>
@@ -231,7 +234,7 @@
     </select>
 
     <select id="getPushUsers" resultMap="ReplacementInstrumentActivityStatDto">
-        SELECT ria.id_,ria.user_id_, su.phone_ mobile_no_, ri.brand_
+        SELECT ria.id_, ria.user_id_, su.phone_ mobile_no_, ri.brand_
         FROM replacement_instrument_activity ria
                  LEFT JOIN sys_user su ON su.id_ = ria.user_id_
                  LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
@@ -242,27 +245,35 @@
 
     <select id="getInfo" resultMap="ReplacementInstrumentActivityStatDto">
         SELECT ria.*,
-               ri.brand_,
-               ri.specification_,
-               ri.param_,
-               ri.market_price_,
-               ri.discount_price_,
-               ri.depreciation_price_,
-               ri.sale_price_,
-               s.name_ subject_name_,
-               co.name_ cooperationOrganName
+               g.brand_,
+               g.specification_,
+               g.brief_                                      param_,
+               g.market_price_,
+               g.discount_price_,
+               g.group_purchase_price_                       sale_price_,
+               (g.discount_price_ - g.group_purchase_price_) depreciation_price_,
+               s.name_                                       subject_name_,
+               co.name_                                      cooperationOrganName
         FROM replacement_instrument_activity ria
-                 LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
-                 LEFT JOIN subject s ON s.id_ = ri.subject_id_
+                 LEFT JOIN goods g ON g.id_ = ria.instruments_id_
+                 LEFT JOIN subject s ON s.id_ = ria.subject_id_
                  LEFT JOIN cooperation_organ co ON co.id_ = ria.cooperation_organ_id_
         WHERE ria.id_ = #{id}
     </select>
 
     <!-- 获取问卷分页数据 -->
     <select id="getPageList" resultMap="ReplacementInstrumentActivityStatDto" parameterType="map">
-        SELECT ria.*,su.phone_ mobile_no_,o.name_ organ_name_,ri.brand_,ri.specification_,ri.param_,ri.market_price_,ri.discount_price_,ri.depreciation_price_,
-        ri.sale_price_,s.name_ subject_name_,co.name_ cooperationOrganName FROM replacement_instrument_activity ria
-        LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
+        SELECT ria.*,su.phone_ mobile_no_,o.name_
+        organ_name_,
+        g.brand_,
+        g.specification_,
+        g.brief_ param_,
+        g.market_price_,
+        g.discount_price_,
+        g.group_purchase_price_ sale_price_,
+        (g.discount_price_ - g.group_purchase_price_) depreciation_price_,
+        s.name_ subject_name_,co.name_ cooperationOrganName FROM replacement_instrument_activity ria
+        LEFT JOIN goods g ON g.id_ = ria.instruments_id_
         LEFT JOIN subject s ON s.id_ = ria.subject_id_
         lEFT JOIN sys_user su ON su.id_ = ria.user_id_
         LEFT JOIN cooperation_organ co ON co.id_ = ria.cooperation_organ_id_
@@ -276,7 +287,7 @@
     <select id="getCount" resultType="int">
         SELECT COUNT(*)
         FROM replacement_instrument_activity ria
-        LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
+        LEFT JOIN goods g ON g.id_ = ria.instruments_id_
         LEFT JOIN cooperation_organ co on co.id_ = ria.cooperation_organ_id_
         LEFT JOIN organization o on o.id_ = co.organ_id_
         <include refid="queryReplacementsCondition"/>

mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentController.java

@@ -1,6 +1,7 @@
 package com.ym.mec.student.controller;
 
 import com.ym.mec.biz.dal.entity.Goods;
+import com.ym.mec.biz.dal.entity.ReplacementInstrument;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
@@ -29,7 +30,7 @@ public class ReplacementInstrumentController extends BaseController {
 
     @ApiOperation(value = "分页查询列表")
     @GetMapping("/queryPage")
-    public HttpResponseResult<PageInfo<Goods>> queryPage(ReplacementInstrumentQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<ReplacementInstrument>> queryPage(ReplacementInstrumentQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");

mec-web/src/main/java/com/ym/mec/web/controller/ReplacementInstrumentActivityController.java

@@ -93,6 +93,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('replacementInstrumentActivity/update')")
     public HttpResponseResult<ReplacementInstrumentActivity> update(ReplacementInstrumentActivity replacementInstrumentActivity) {
+        replacementInstrumentActivity.setGoodsId(replacementInstrumentActivity.getInstrumentsId());
         ReplacementInstrumentActivity oldReplacementInstrumentActivity = replacementInstrumentActivityDao.getLock(replacementInstrumentActivity.getId());
         if (!oldReplacementInstrumentActivity.getPayStatus().equals(0)) {
             return failed("支付中、已支付的乐器置换，不能修改");

mec-web/src/main/java/com/ym/mec/web/controller/ReplacementInstrumentController.java

@@ -2,9 +2,12 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.ReplacementInstrument;
 import com.ym.mec.biz.dal.page.ReplacementInstrumentQueryInfo;
 import com.ym.mec.biz.service.ReplacementInstrumentService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +27,7 @@ public class ReplacementInstrumentController extends BaseController {
     @ApiOperation(value = "分页查询列表")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('replacementInstrument/queryPage')")
-    public Object queryPage(ReplacementInstrumentQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<ReplacementInstrument>> queryPage(ReplacementInstrumentQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");