Merge remote-tracking branch 'origin/dev' into dev

alien-entity/src/main/java/shop/alien/entity/store/LifeUserDynamics.java

@@ -126,11 +126,6 @@ public class LifeUserDynamics {
     @TableField("business_id")
     private Integer businessId;
 
-    @ApiModelProperty(value = "根据动态进入店铺详情浏览数")
-    @TableField("store_count")
-    private Integer storeCount;
-
-
     @ApiModelProperty(value = "转发量")
     @TableField("transfer_count")
     private Integer transferCount;

alien-entity/src/main/java/shop/alien/entity/store/LifeUserExpertWorks.java

@@ -96,4 +96,7 @@ public class LifeUserExpertWorks extends Model<LifeUserExpertWorks> {
     @TableField(value = "dynamics_id")
     private Integer dynamicsId;
 
+    @ApiModelProperty(value = "实际gmv")
+    @TableField(value = "real_order_gmv")
+    private BigDecimal realOrderGmv;
 }

alien-entity/src/main/java/shop/alien/entity/store/LifeUserOrder.java

@@ -94,7 +94,7 @@ public class LifeUserOrder {
     @TableField("send_discount_coupon_flag")
     private Integer sendDiscountCouponFlag;
 
-    @ApiModelProperty(value = "默认0 通过gmv链接购买为 1")
-    @TableField("order_gmv")
-    private Integer orderGmv;
+    @ApiModelProperty(value = "达人订单id")
+    @TableField("expert_order_id")
+    private Integer expertOrderId;
 }

alien-entity/src/main/resources/mapper/LifeUserExpertWorksMapper.xml

@@ -14,11 +14,18 @@
         <result column="created_user_id" property="createdUserId" />
         <result column="updated_time" property="updatedTime" />
         <result column="updated_user_id" property="updatedUserId" />
+        <result column="order_gmv" property="orderGmv" />
+        <result column="real_order_gmv" property="realOrderGmv" />
+        <result column="introduction" property="introduction" />
+        <result column="like_count" property="likeCount" />
+        <result column="comment_count" property="commentCount" />
+        <result column="share_count" property="shareCount" />
+        <result column="dynamics_id" property="dynamicsId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, expert_id, order_id, works_url, play_count, delete_flag, created_time, created_user_id, updated_time, updated_user_id
+        id, expert_id, order_id, works_url, play_count, delete_flag, created_time, created_user_id, updated_time, updated_user_id, order_gmv, real_order_gmv, introduction, like_count, comment_count, share_count, dynamics_id
     </sql>
 
 </mapper>

alien-second/src/main/java/shop/alien/second/service/impl/SecondTradeRecordServiceImpl.java

@@ -282,6 +282,7 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
                 SecondRiskControlRecord riskControlRecord = new SecondRiskControlRecord();
                 riskControlRecord.setRuleType(1);
                 riskControlRecord.setUserId(trade.getSellerId());
+                riskControlRecord.setBusinessId(String.valueOf(trade.getSellerId()));
                 riskControlRecord.setRuleName(riskControlProperties.getMoneyLaundering().getRiskType());
                 JSONArray detailInfo = new JSONArray();
                 detailInfo.addAll(recordList.stream().map(SecondTradeRecord::getId).collect(Collectors.toList()));

alien-second/src/main/java/shop/alien/second/service/impl/SecondUserCreditServiceImpl.java

@@ -112,7 +112,18 @@ public class SecondUserCreditServiceImpl extends ServiceImpl<SecondUserCreditMap
                 record.setPoints(200);
                 record.setPointsType(2);
                 secondUserCreditRecordMapper.insert(record);
-                secondUserCreditMapper.updatePointsByUserId(userId, 200);
+
+                LambdaQueryWrapper<SecondUserCredit> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(SecondUserCredit::getUserId, userId);
+                SecondUserCredit userCredit = secondUserCreditMapper.selectOne(queryWrapper);
+                if (userCredit != null) {
+                    secondUserCreditMapper.updatePointsByUserId(userId, 200);
+                } else {
+                    SecondUserCredit credit = new SecondUserCredit();
+                    credit.setUserId(userId);
+                    credit.setUserPoints(200);
+                    secondUserCreditMapper.insert(credit);
+                }
             }
             return true;
         } catch (Exception e) {

alien-store/src/main/java/shop/alien/store/controller/LifeUserDynamicsController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.*;
@@ -85,6 +86,7 @@ public class LifeUserDynamicsController {
     @ApiOperation(value = "发布动态社区", notes = "0:成功, 1:失败, 2:文本内容异常, 3:图片内容异常")
     @ApiOperationSupport(order = 2)
     @PostMapping("/addOrUpdate")
+    @Transactional(rollbackFor = Exception.class)
     public R<Integer> addOrUpdate(@RequestBody LifeUserDynamics lifeUserDynamics) {
         log.info("LifeUserDynamicsController.addOrUpdate?store={}", lifeUserDynamics.toString());
         /*Map<String, String> checkText = TextCheckUtil.check(lifeUserDynamics.getContext());
@@ -114,12 +116,12 @@ public class LifeUserDynamicsController {
             }
             lifeUserDynamics.setUpdatedTime(new Date());
             int cnt = 0;
-            if(lifeUserDynamics.getType().equals(4)){
+            if(lifeUserDynamics.getType().equals("4")){
                 cnt = lifeUserDynamicsService.addOrUpdateStore(lifeUserDynamics);
                 if(cnt > 0){
-                        LifeUserExpertOrder lifeUserExpertOrder = lifeUserExpertOrderMapper.selectById(new LambdaQueryWrapper<LifeUserExpertOrder>()
-                                .eq(LifeUserExpertOrder :: getId, lifeUserDynamics.getBusinessId()));
+                        LifeUserExpertOrder lifeUserExpertOrder = lifeUserExpertOrderMapper.selectById(lifeUserDynamics.getBusinessId());
                         if(lifeUserExpertOrder !=null){
+                            //达人发布动态 订单状态变为履约中
                             lifeUserExpertOrder.setStatus(4);
                             lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
                         }

alien-store/src/main/java/shop/alien/store/service/LifeUserDynamicsService.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -599,9 +600,12 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
         return lifeUserDynamicsVo;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public R countGvm(Integer dynamicsId, String finalPrice, Integer orderId, Integer expertId, Integer expertOrderId) {
             LambdaQueryWrapper<LifeUserExpertWorks> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(LifeUserExpertWorks :: getExpertId, expertId);
+            lambdaQueryWrapper.eq(LifeUserExpertWorks :: getOrderId, expertOrderId);
+            lambdaQueryWrapper.eq(LifeUserExpertWorks :: getDynamicsId, dynamicsId);
             LifeUserExpertWorks lifeUserExpertWorks = lifeUserExpertWorksMapper.selectOne(lambdaQueryWrapper);
             if(lifeUserExpertWorks != null){
                 BigDecimal price = new BigDecimal(finalPrice);
@@ -609,10 +613,14 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
                 lifeUserExpertWorksMapper.updateById(lifeUserExpertWorks);
             }
 
-        LifeUserExpertOrder lifeUserExpertOrder = lifeUserExpertOrderMapper.selectOne(new LambdaQueryWrapper<LifeUserExpertOrder>().eq(LifeUserExpertOrder::getId, expertOrderId));
+        LifeUserExpertOrder lifeUserExpertOrder = lifeUserExpertOrderMapper.selectOne(new LambdaQueryWrapper<LifeUserExpertOrder>()
+                .eq(LifeUserExpertOrder::getId, expertOrderId));
         if (lifeUserExpertOrder != null && lifeUserExpertOrder.getStatus() != 5) {
-            LifeUserExpertWorks lifeUserExpertWorks1 = lifeUserExpertWorksMapper.selectOne(new LambdaQueryWrapper<LifeUserExpertWorks>().eq(LifeUserExpertWorks::getOrderId, expertOrderId));
-            int liulanNum = lifeBrowseRecordMapper.selectCount(new LambdaQueryWrapper<LifeBrowseRecord>().eq(LifeBrowseRecord :: getDynamicsId, dynamicsId).eq(LifeBrowseRecord :: getOrderId, expertOrderId));
+            LifeUserExpertWorks lifeUserExpertWorks1 = lifeUserExpertWorksMapper.selectOne(new LambdaQueryWrapper<LifeUserExpertWorks>()
+                    .eq(LifeUserExpertWorks :: getOrderId, expertOrderId)
+                    .eq(LifeUserExpertWorks :: getExpertId, expertId));
+            int liulanNum = lifeBrowseRecordMapper.selectCount(new LambdaQueryWrapper<LifeBrowseRecord>()
+                    .eq(LifeBrowseRecord :: getDynamicsId, dynamicsId).eq(LifeBrowseRecord :: getOrderId, expertOrderId));
             if (lifeUserExpertWorks1.getOrderGmv().compareTo(lifeUserExpertOrder.getOrderGmv()) >= 0 && liulanNum >= lifeUserExpertOrder.getOrderPlayCount()) {
                 lifeUserExpertOrder.setStatus(5);
                 lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
@@ -621,7 +629,7 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
         LambdaQueryWrapper<LifeUserOrder> userOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
         userOrderLambdaQueryWrapper.eq(LifeUserOrder :: getId, orderId);
         LifeUserOrder lifeUserOrder = lifeUserOrderMapper.selectOne(userOrderLambdaQueryWrapper);
-        lifeUserOrder.setOrderGmv(1);
+        lifeUserOrder.setExpertOrderId(expertOrderId);
         lifeUserOrderMapper.updateById(lifeUserOrder);
         return R.success("请求成功");
     }
@@ -649,7 +657,7 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
             lifeUserExpertWorksMapper.update(null,lambdaUpdateWrapper);
         }
 
-        //查询gvm和进店详情浏览数数是否满足当前达人订单规定值 都满足修改订单状态为已完成
+        //查询gmv和进店详情浏览数数是否满足当前达人订单规定值 都满足修改订单状态为已完成
         LifeUserExpertOrder lifeUserExpertOrder = lifeUserExpertOrderMapper.selectOne(new LambdaQueryWrapper<LifeUserExpertOrder>().eq(LifeUserExpertOrder::getId, lifeBrowseRecord.getOrderId()));
         if (lifeUserExpertOrder != null && lifeUserExpertOrder.getStatus() != 5) {
             int liulanNum = lifeBrowseRecordMapper.selectCount(new LambdaQueryWrapper<LifeBrowseRecord>().eq(LifeBrowseRecord :: getDynamicsId, lifeBrowseRecord.getDynamicsId())