springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -423,6 +423,11 @@ return R.fail("商家id不能为空"); } if(StringUtils.isEmpty(item.getOrderId())) { return R.fail("订单id不能为空"); } if(StringUtils.isEmpty(item.getUserId())) { return R.fail("评论人id不能为空"); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCreditsExchangeVO.java
@@ -101,5 +101,10 @@ @ApiModelProperty(value = "商品购买数量") private String palyNum; /** * 是否评价 0未评价 1已评价 */ @ApiModelProperty(value = "是否评价 0未评价 1已评价") private String isEvaluate; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantEvaluateVO.java
@@ -77,6 +77,12 @@ @ApiModelProperty(value = "评价分数") private String evaluateGrade; /** * 订单id */ @ApiModelProperty(value = "订单id") private String orderId; @ApiModelProperty(value = "商家名称") private String merchantName; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerCreditsExchange.java
@@ -132,6 +132,12 @@ private String palyNum; /** * 是否评价 0未评价 1已评价 */ @ApiModelProperty(value = "是否评价 0未评价 1已评价") private String isEvaluate; /** * 商家名称 */ @TableField(exist = false) springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerMerchantEvaluate.java
@@ -80,6 +80,13 @@ private String evaluateGrade; /** * 订单id */ @ApiModelProperty(value = "订单id") private String orderId; @TableField(exist = false) @ApiModelProperty(value = "商家名称") private String merchantName; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java
@@ -211,11 +211,12 @@ item.setCondition("3"); //设置订单号 item.setOrderNumber(Snowflake.getId()+""); String orderNum=Snowflake.getId()+""; item.setOrderNumber(orderNum); int num= baseMapper.insertData(item); if(num>0) { return R.ok(); return R.ok(orderNum); } return R.fail("操作失败"); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantEvaluateImpl.java
@@ -3,14 +3,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.VolunteerCreditsExchangeVO; import com.panzhihua.common.model.vos.community.VolunteerMerchantEvaluateVO; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.VolunteerMerchantEvaluateDao; import com.panzhihua.service_community.entity.VolunteerCreditsExchange; import com.panzhihua.service_community.entity.VolunteerMerchantEvaluate; import com.panzhihua.service_community.service.VolunteerCreditsExchangeService; import com.panzhihua.service_community.service.VolunteerMerchantEvaluateService; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import javax.annotation.Resource; @Slf4j @@ -18,6 +23,10 @@ public class VolunteerMerchantEvaluateImpl extends ServiceImpl<VolunteerMerchantEvaluateDao, VolunteerMerchantEvaluate> implements VolunteerMerchantEvaluateService { @Resource private VolunteerCreditsExchangeService vceService; @Override public R getList(int pageNum, int pageSize,String communityId,String merchantId) @@ -37,10 +46,22 @@ } @Override public R insert(VolunteerMerchantEvaluateVO item) { public R insert(VolunteerMerchantEvaluateVO item) { if(StringUtils.isEmpty(item.getOrderId())) { return R.fail("orderId不能为空"); } R<VolunteerCreditsExchange> volunteerCreditsExchangeR=vceService.getData(item.getOrderId()); VolunteerCreditsExchangeVO vce=new VolunteerCreditsExchangeVO(); vce.setId(volunteerCreditsExchangeR.getData().getId()); vce.setIsEvaluate("1"); int num= baseMapper.insert(item); if(num>0) { vceService.update(vce); return R.ok(); } return R.fail("添加失败"); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCreditsExchangeMapper.xml
@@ -19,6 +19,7 @@ <result property="palyIntegral" column="paly_integral" /> <result property="merchantId" column="merchant_id" /> <result property="palyNum" column="paly_num" /> <result property="isEvaluate" column="is_evaluate" /> </resultMap> @@ -40,7 +41,9 @@ vce.order_type, vce.paly_integral, vce.merchant_id, (select vm.name from volunteer_merchant as vm where vce.merchant_id=vm.id) as merchantName, vce.paly_num, vce.is_evaluate, vce.update_time from volunteer_credits_exchange as vce where vce.id=#{id} @@ -67,6 +70,7 @@ vce.merchant_id, (select vm.name from volunteer_merchant as vm where vce.merchant_id=vm.id) as merchantName, vce.paly_num, vce.is_evaluate, vce.update_time from volunteer_credits_exchange as vce <where> @@ -144,6 +148,9 @@ <if test="item.palyNum != null"> paly_num, </if> <if test="item.isEvaluate != null"> is_evaluate, </if> creation_time </trim> values @@ -189,6 +196,9 @@ </if> <if test="item.palyNum != null"> #{item.palyNum}, </if> <if test="item.isEvaluate != null"> #{item.isEvaluate}, </if> sysdate() </trim> @@ -239,6 +249,9 @@ <if test="item.palyNum != null"> paly_num=#{item.palyNum}, </if> <if test="item.isEvaluate != null"> is_evaluate=#{item.isEvaluate}, </if> update_time=sysdate() </set> where id = #{item.id} springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantEvaluateMapper.xml
@@ -13,6 +13,7 @@ <result property="evaluateUrl" column="evaluate_url" /> <result property="goodId" column="good_id" /> <result property="evaluateGrade" column="evaluate_grade" /> <result property="orderId" column="order_id" /> </resultMap> <!-- 分页查询 --> @@ -30,6 +31,7 @@ vme.good_id, vme.evaluate_grade, vme.creation_time, vme.order_id, vme.update_time from volunteer_merchant_evaluate as vme <where> @@ -59,9 +61,10 @@ vme.good_id, vme.evaluate_grade, vme.creation_time, vme.order_id, vme.update_time from volunteer_merchant_evaluate as vme where vme.id=#{id} where vme.id=#{id} or vme.order_id=#{id} </select> <insert id="insert"> @@ -91,6 +94,9 @@ <if test="item.communityId != null"> community_id, </if> <if test="item.orderId != null"> order_id, </if> creation_time </trim> values @@ -118,6 +124,9 @@ </if> <if test="item.communityId != null"> #{item.communityId}, </if> <if test="item.orderId != null"> #{item.orderId}, </if> sysdate() </trim> @@ -150,9 +159,12 @@ <if test="item.communityId != null"> community_id=#{item.communityId}, </if> <if test="item.orderId != null"> order_id=#{item.orderId}, </if> update_time=sysdate() </set> where id = #{volunteerTypeVO.id} where id = #{item.id} </update> <delete id="delete" parameterType="String">
