推广积分结算以及导出

twzd-admin/src/main/java/com/miaxis/app/controller/extension/WxExtensionIncomeController.java

@@ -41,9 +41,7 @@ public class WxExtensionIncomeController extends BaseController {
 
 
 
-    /**
-     * 查询收益金额（总金额、已提现金额、未提现金额）
-     */
+
     @GetMapping(value = "/extensionIncomePrice")
     @ApiOperation("对下级结算")
     public Response extensionIncomePrice(ExtensionSettleDTO extensionSettleDTO) {

twzd-admin/src/main/java/com/miaxis/pc/controller/extension/PcWxExtensionIncomeController.java

@@ -1,9 +1,12 @@
 package com.miaxis.pc.controller.extension;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.extension.dto.ExtensionIncomeListDTO;
 import com.miaxis.extension.service.IWxExtensionIncomeService;
 import com.miaxis.extension.vo.ExtensionIncomeVo;
@@ -11,12 +14,16 @@ import com.miaxis.spread.service.IWxSpreadRelationService;
 import com.miaxis.user.service.IUserInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -61,5 +68,36 @@ public class PcWxExtensionIncomeController extends BaseController {
     }
 
 
+    /**
+     * 导出微信永久二维码口令列表
+     */
+    @PreAuthorize("@ss.hasPermi('proxyscore:index:exportExcel')")
+    @Log(title = "导出积分列表", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出积分列表")
+    public Response<String> export(ExtensionIncomeListDTO dto){
+        List<ExtensionIncomeVo> list = userInfoService.getPcDownLevelPoints(dto);
+        list.stream().forEach(o-> o.setSettleMoney(o.getAchievement()/100.0));
+        ExcelUtil<ExtensionIncomeVo> util = new ExcelUtil<ExtensionIncomeVo>(ExtensionIncomeVo.class);
+        return util.exportExcel(list, "code");
+    }
+
+    @PreAuthorize("@ss.hasPermi('proxyscore:index:balance')")
+    @GetMapping(value = "/extensionIncomePrice/{ids}")
+    @ApiOperation("结算积分")
+    public Response extensionIncomePrice( @ApiParam(name = "ids", value = "collectionids参数", required = true)
+                                              @PathVariable Long[] ids) {
+
+        List<UserInfo> list = userInfoService.list(new QueryWrapper<UserInfo>().in("id", Arrays.asList(ids)));
+        list.stream().forEach(userInfo->{
+            userInfo.setAchievementSettled(userInfo.getAchievementSettled()+userInfo.getAchievement());
+            userInfo.setAchievement(0);
+        });
+        userInfoService.updateBatchById(list);
+
+        return Response.success();
+    }
+
+
 
 }

twzd-service/src/main/java/com/miaxis/extension/vo/ExtensionIncomeVo.java

@@ -1,6 +1,7 @@
 package com.miaxis.extension.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,6 +25,8 @@ public class ExtensionIncomeVo {
     @ApiModelProperty(value = "微信openid")
     private String openid;
 
+
+    @Excel(name = "微信昵称")
     @TableField("nick_name")
     @ApiModelProperty(value = "微信昵称")
     private String nickName;
@@ -32,19 +35,29 @@ public class ExtensionIncomeVo {
     @ApiModelProperty(value = "微信头像地址")
     private String headImage;
 
+
+    @Excel(name = "总推广积分")
     @ApiModelProperty(value = "总推广积分")
     private Integer achievementTotal;
 
+
+    @Excel(name = "未结算推广积分")
     @ApiModelProperty(value = "未结算推广积分")
     private Integer achievement;
 
+    @Excel(name = "已结算推广积分")
     @ApiModelProperty(value = "已结算推广积分")
     private Integer achievementSettled;
 
+    @Excel(name = "推广人数")
     @ApiModelProperty(value = "推广人数")
     private Integer extensionCount;
 
+
     @ApiModelProperty(value = "消费金额(分)")
     private Integer costCount;
 
+    @Excel(name = "需付佣金(单位:元)")
+    private Double settleMoney;
+
 }

twzd-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -243,9 +243,9 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
             throw new CustomException("该订单不存在");
         }
         //幂等性判定
-        if (!StringUtils.isEmpty(wxOrder.getTradeState())){
-            return ;
-        }
+//        if (!StringUtils.isEmpty(wxOrder.getTradeState())){
+//            return ;
+//        }
         wxOrder.setTransactionId(jsonObject.getString("transaction_id"));
         JSONObject amount = jsonObject.getJSONObject("amount");
         wxOrder.setPayerTotal(amount.getInteger("payer_total"));