Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/HfMemberDto.java

@@ -1,41 +1,56 @@
 package com.ym.mec.biz.dal.dto;
 
-import org.apache.poi.ss.formula.functions.T;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.web.multipart.MultipartFile;
 
 public class HfMemberDto {
-    //商户号
+    @ApiModelProperty(value = "商户号",required = true)
     private String memberId;
-    //公司名称
+
+    @ApiModelProperty(value = "公司名称",required = true)
     private String name;
-    //省份编号
+
+    @ApiModelProperty(value = "省份编号",required = true)
     private String provCode;
-    //城市编号
+
+    @ApiModelProperty(value = "城市编号",required = true)
     private String areaCode;
-    //统一社会信用码
+
+    @ApiModelProperty(value = "统一社会信用码",required = true)
     private String socialCreditCode;
-    //统一社会信用码有效期
+
+    @ApiModelProperty(value = "统一社会信用码有效期",required = true)
     private String socialCreditCodeExpires;
-    //经营范围
+
+    @ApiModelProperty(value = "经营范围",required = true)
     private String businessScope;
-    //法人
+
+    @ApiModelProperty(value = "法人",required = true)
     private String legalPerson;
-    //法人身份证号
+
+    @ApiModelProperty(value = "法人身份证号",required = true)
     private String legalCertId;
-    //身份证有效期
+
+    @ApiModelProperty(value = "身份证有效期",required = true)
     private String legalCertIdExpires;
-    //法人手机号
+
+    @ApiModelProperty(value = "法人手机号",required = true)
     private String legalMp;
-    //公司地址
+
+    @ApiModelProperty(value = "公司地址",required = true)
     private String address;
-    //邮编
+
+    @ApiModelProperty(value = "邮编",required = true)
     private String zipCode;
-    //银行卡号
+
+    @ApiModelProperty(value = "银行卡号",required = true)
     private String cardNo;
-    //银行编码
+
+    @ApiModelProperty(value = "银行编码",required = true)
     private String bankCode;
-    //文件
-    private MultipartFile path;
+
+    @ApiModelProperty(value = "证照文件",required = true)
+    private MultipartFile multipartFile;
 
     public String getMemberId() {
         return memberId;
@@ -68,4 +83,100 @@ public class HfMemberDto {
     public void setAreaCode(String areaCode) {
         this.areaCode = areaCode;
     }
+
+    public String getSocialCreditCode() {
+        return socialCreditCode;
+    }
+
+    public void setSocialCreditCode(String socialCreditCode) {
+        this.socialCreditCode = socialCreditCode;
+    }
+
+    public String getSocialCreditCodeExpires() {
+        return socialCreditCodeExpires;
+    }
+
+    public void setSocialCreditCodeExpires(String socialCreditCodeExpires) {
+        this.socialCreditCodeExpires = socialCreditCodeExpires;
+    }
+
+    public String getBusinessScope() {
+        return businessScope;
+    }
+
+    public void setBusinessScope(String businessScope) {
+        this.businessScope = businessScope;
+    }
+
+    public String getLegalPerson() {
+        return legalPerson;
+    }
+
+    public void setLegalPerson(String legalPerson) {
+        this.legalPerson = legalPerson;
+    }
+
+    public String getLegalCertId() {
+        return legalCertId;
+    }
+
+    public void setLegalCertId(String legalCertId) {
+        this.legalCertId = legalCertId;
+    }
+
+    public String getLegalCertIdExpires() {
+        return legalCertIdExpires;
+    }
+
+    public void setLegalCertIdExpires(String legalCertIdExpires) {
+        this.legalCertIdExpires = legalCertIdExpires;
+    }
+
+    public String getLegalMp() {
+        return legalMp;
+    }
+
+    public void setLegalMp(String legalMp) {
+        this.legalMp = legalMp;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getZipCode() {
+        return zipCode;
+    }
+
+    public void setZipCode(String zipCode) {
+        this.zipCode = zipCode;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public MultipartFile getMultipartFile() {
+        return multipartFile;
+    }
+
+    public void setMultipartFile(MultipartFile multipartFile) {
+        this.multipartFile = multipartFile;
+    }
 }

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

@@ -522,6 +522,7 @@
             <if test="organIds != null">
                 AND FIND_IN_SET (mg.organ_id_,#{organIds})
             </if>
+            AND (mg.del_flag_ IS NULL OR mg.del_flag_=0)
         </where>
         GROUP BY mg.id_
         ORDER BY mg.create_time_ ASC

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

@@ -1,17 +1,30 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.dto.HfMemberDto;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.thirdparty.adapay.CorpMember;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.util.upload.UploadUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.core.io.Resource;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Map;
 
 @RequestMapping("adapay")
 @Api(tags = "汇付服务")
@@ -21,18 +34,44 @@ public class AdapayController extends BaseController {
 
     @ApiOperation("新建企业用户")
     @PostMapping(value = "createMember")
-    public Object queryRegisterContract(MultipartFile file) throws Exception {
+    public HttpResponseResult createMember(HfMemberDto member) throws Exception {
 
-        HashMap<String, Object> memberParams = new HashMap<>();
-        memberParams.put("order_no", "corp_mem_" + System.currentTimeMillis());
+        File file = new File("/var/tmp/" + member.getMultipartFile().getOriginalFilename());
+        InputStream inputStream = member.getMultipartFile().getInputStream();
 
-        memberParams.put("bank_acct_type", "1");
-        memberParams.put("card_name", "武汉大雅乐盟教育咨询有限公司");
+        try {
+            if (!file.getParentFile().exists()) {
+                file.getParentFile().mkdirs();
+            }
+            FileOutputStream fos = new FileOutputStream(file);
+            IOUtils.copy(inputStream, fos);
 
-        String path = "C:/Users/river/Desktop/imgzip/武汉大雅乐盟教育咨询有限公司.zip";
-
-        new CorpMember().executeCreateMember(memberParams,path);
-        return true;
+            HashMap<String, Object> memberParams = new HashMap<>();
+            memberParams.put("order_no", "corp_mem_" + System.currentTimeMillis());
+            memberParams.put("member_id", member.getMemberId());
+            memberParams.put("name", member.getName());
+            memberParams.put("prov_code", member.getProvCode());
+            memberParams.put("area_code", member.getAreaCode());
+            memberParams.put("social_credit_code", member.getSocialCreditCode());
+            memberParams.put("social_credit_code_expires", member.getSocialCreditCodeExpires());
+            memberParams.put("business_scope", member.getBusinessScope());
+            memberParams.put("legal_person", member.getLegalPerson());
+            memberParams.put("legal_cert_id", member.getLegalCertId());
+            memberParams.put("legal_cert_id_expires", member.getLegalCertIdExpires());
+            memberParams.put("legal_mp", member.getLegalMp());
+            memberParams.put("address", member.getAddress());
+            memberParams.put("zip_code", member.getZipCode());
+            memberParams.put("bank_code", member.getBankCode());
+            memberParams.put("bank_acct_type", "1");
+            memberParams.put("card_no", member.getCardNo());
+            memberParams.put("card_name", member.getName());
+            return succeed(new CorpMember().executeCreateMember(memberParams, file));
+        } catch (IOException e) {
+            throw new BizException("文件上传失败，请重试");
+        } finally {
+            IOUtils.closeQuietly(inputStream);
+            file.deleteOnExit();
+        }
     }
 
 

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

@@ -2041,7 +2041,13 @@ public class ExportController extends BaseController {
                 organIds = employee.getOrganIdList();
             }
         }
-        List<MusicGroupRegisterDto> musicGroupRegisters = musicGroupDao.getMusicGroupRegister(null,organIds);
+
+        List<MusicGroupStatusEnum> musicGroupStatusList = new ArrayList<>();
+        musicGroupStatusList.add(MusicGroupStatusEnum.PAY);
+        musicGroupStatusList.add(MusicGroupStatusEnum.PREPARE);
+        musicGroupStatusList.add(MusicGroupStatusEnum.PROGRESS);
+        musicGroupStatusList.add(MusicGroupStatusEnum.PAUSE);
+        List<MusicGroupRegisterDto> musicGroupRegisters = musicGroupDao.getMusicGroupRegister(musicGroupStatusList,organIds);
 
         if (musicGroupRegisters.size() <= 0) {
             response.setStatus(200);