Merge branch 'develop' into release

tuoheng-api/src/main/java/com/tuoheng/api/service/impl/WestreamVideoServiceImpl.java

@@ -17,6 +17,7 @@ import com.tuoheng.common.utils.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 
@@ -83,6 +84,7 @@ public class WestreamVideoServiceImpl extends BaseServiceImpl<WestreamVideoMappe
     }
 
     @Override
+    @Transactional
     public JsonResult updateProgress(WestreamVideoQuery query) {
         if(null == query.getTenantId() || StringUtils.isEmpty(query.getOpenid())){
             return JsonResult.error("参数为空！");
@@ -138,6 +140,10 @@ public class WestreamVideoServiceImpl extends BaseServiceImpl<WestreamVideoMappe
                             userPointsDetail.setCreateTime(new Date());
                             userPointsDetailMapper.insert(userPointsDetail);
 
+                            //用户积分更新
+                            westreamUser.setMallPoints(westreamUser.getMallPoints() + userPointsDetail.getPointsChange());
+                            westreamUserMapper.updateById(westreamUser);
+
                             //TODO 对接商城
                             }
                         }