Explorar o código

查询随身帮经销商人员列表,设置收货人状态修改

qxm %!s(int64=4) %!d(string=hai) anos
pai
achega
50dde1bf82

+ 35 - 1
suishenbang-api/src/test/java/test/MyTest.java

@@ -6,6 +6,7 @@ import com.dgtly.ApiApplication;
 import com.dgtly.system.domain.CustomersExt;
 import com.dgtly.system.domain.SysUser;
 import com.dgtly.wxportal.service.ESignService;
+import com.dgtly.wxportal.service.IEsignSignService;
 import com.dgtly.wxportal.utils.ESign.ESignHttpUtil;
 import com.dgtly.wxportal.utils.ESign.ESignUploadUtil;
 import com.dgtly.wxportal.utils.ESign.ESignUrl;
@@ -27,6 +28,8 @@ public class MyTest {
     private ESignHttpUtil eSignHttpUtil;
     @Autowired
     private ESignService eSignService;
+    @Autowired
+    private IEsignSignService signService;
     @Test
     public void test(){
 
@@ -46,7 +49,38 @@ public class MyTest {
         CustomersExt result = eSignService.createThirdParty(customersExt);
 
 
-        System.out.println(result);
+        //创建文件
+//        String s = eSignService.upload("D:/SZSM/工作交接表.docx");
+        /*个人认证*/
+//        String s = personRealnVerifyService.personRealnVerify("7303abf8d1e54308a889ee61db2639da");
+        /*企业认证*/
+//        String s = organRealVerifyService.organRealVerify("85cfb45c3bcb4ba5962ab56cc316c2af","2d977a3e8f14400d8ecede8d7c584813");
+
+        /** 一步发起签署
+         *
+         * 最基本信息发起签署流程
+         *
+         * 1、流程基本信息(是否自动归档,默认false。--autoArchive,文件主题-businessScene)
+         * 2、待签文档信息(文档id-fileId、文件名称-fileName)
+         *
+         *
+         * copierAccountId 抄送人id
+         * fileId 文档id
+         * fileName 文件名称
+         * signerAccountId 签署操作人个人账号标识,即操作本次签署的个人注:平台用户自动签署时,该参数需要传入签署主体账号id*/
+//        String s = signService.oneStepFlow("测试一部签署","f6ada0144a464d7bb90224104d1c4ca3","合同.pdf","7303abf8d1e54308a889ee61db2639da","7303abf8d1e54308a889ee61db2639da");
+        /*开启签署流程*/
+//        String s = signService.processStart("456e7367066f406b8d62fcd25f65e793");
+//        /*获取签署地址*/
+//        String s = signService.processExecuteUrl("456e7367066f406b8d62fcd25f65e793","7303abf8d1e54308a889ee61db2639da","6cad4e8a08c34711853ba96973ecf24d");
+        /*查询流程签署列表人*/
+//        String s = signService.processExecuteSigners("7ea59df3f2384bf882b0f37d9cb8c0b1");
+//        /*流程归档*/
+//        String s = signService.processArchiv("0cee5f3db6f8411b9cdefb1c7175cfaf");
+        /*签署文件下载*/
+        String s = signService.processDocumentDownload("c35e714481bb4a0288a81cf94bc3508e");
+
+        System.out.println(s);
         System.out.println("111111");
 
     }

+ 10 - 0
suishenbang-system/src/main/java/com/dgtly/system/domain/SysUser.java

@@ -110,6 +110,8 @@ public class SysUser extends BaseEntity
     private String receiveUrlMobileNo;
     /** 用户销售信息扩展 */
     private SysUserExt  sysUserExt;
+    /** 是否收货人 */
+    private String  isConsignee;
 
 
     //    /** 所属销售组织等级 详见字典(sales_level) */
@@ -456,6 +458,14 @@ public class SysUser extends BaseEntity
         this.receiveUrlMobileNo = receiveUrlMobileNo;
     }
 
+    public String getIsConsignee() {
+        return isConsignee;
+    }
+
+    public void setIsConsignee(String isConsignee) {
+        this.isConsignee = isConsignee;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

+ 8 - 0
suishenbang-system/src/main/java/com/dgtly/system/mapper/SysUserMapper.java

@@ -172,4 +172,12 @@ public interface SysUserMapper
      */
     @MapKey("customer_code")
     Map<String,Map<String,Object>> selectLoginNamesByCostumerCode(String[] customerCodes);
+    /**
+     * @description: 根据经销商code查询经销人员列表
+     * @param: [orgCode]
+     * @return: void
+     * @author: qxm
+     * @date: 2020/10/19 14:36
+     */
+    List<SysUser> selectUserByOrgCode(String orgCode);
 }

+ 9 - 1
suishenbang-system/src/main/java/com/dgtly/system/service/ISysUserService.java

@@ -5,7 +5,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.dgtly.common.exception.BusinessException;
-import com.dgtly.common.json.JSONObject;
 import com.dgtly.system.domain.SysUser;
 
 /**
@@ -240,4 +239,13 @@ public interface ISysUserService
     Map<String,Map<String,Object>> selectLoginNamesByCostumerCode(Set<String> customerCodes);
 
     public int insertPersonalAccount(SysUser user);
+
+    /**
+     * @description: 根据经销商code查询经销人员列表
+     * @param: [orgCode]
+     * @return: java.util.List<com.dgtly.system.domain.SysUser>
+     * @author: qxm      
+     * @date: 2020/10/19 14:38
+     */ 
+    List<SysUser> selectUserByOrgCode(String orgCode);
 }

+ 11 - 1
suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserServiceImpl.java

@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.dgtly.common.json.JSONObject;
 import com.dgtly.system.domain.*;
 import com.dgtly.system.mapper.*;
 import org.slf4j.Logger;
@@ -605,5 +604,16 @@ public class SysUserServiceImpl implements ISysUserService
     public int insertPersonalAccount(SysUser user) {
         return userMapper.updateUser(user);
     }
+    /**
+     * @description: 根据经销商code查询经销人员列表
+     * @param: [orgCode]
+     * @return: void
+     * @author: qxm
+     * @date: 2020/10/19 14:36
+     */
+    @Override
+    public List<SysUser> selectUserByOrgCode(String orgCode) {
+        return userMapper.selectUserByOrgCode(orgCode);
+    }
 
 }

+ 15 - 0
suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"     column="update_by"    />
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
+		<result property="isConsignee"       column="is_consignee"       />
         <!--<result property="salesLevel"   column="sales_level"  />-->
         <!--<result property="orgName"      column="org_name"     />-->
         <!--<result property="orgCode"      column="org_code"     />-->
@@ -248,6 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
+ 			<if test="isConsignee != null">is_consignee = #{isConsignee},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}
@@ -357,5 +359,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</foreach>
 		GROUP BY sue.org_code
 	</select>
+	<select id="selectUserByOrgCode" resultMap="SysUserResult">
+		SELECT
+			u.user_id,
+			u.user_name,
+			u.is_consignee,
+			v.sap_employee_id,
+			v.org_code
+		FROM
+			sys_user u
+		LEFT JOIN sys_user_ext v ON u.user_id = v.user_id
+		WHERE
+			v.org_code =#{orgCode}
+	</select>
 
 </mapper> 

+ 48 - 0
suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxPortalController.java

@@ -8,7 +8,9 @@ import com.dgtly.common.core.domain.AjaxResult;
 import com.dgtly.common.core.domain.ParameterObject;
 import com.dgtly.system.domain.CustomersExt;
 import com.dgtly.system.domain.SysUser;
+import com.dgtly.system.domain.SysUserExt;
 import com.dgtly.system.service.ICustomersExtService;
+import com.dgtly.system.service.ISysUserExtService;
 import com.dgtly.system.service.ISysUserService;
 import com.dgtly.wxportal.domain.WxBanner;
 import com.dgtly.wxportal.domain.WxMagnet;
@@ -42,6 +44,8 @@ public class WxPortalController extends ApiBaseController {
     @Autowired
     private ISysUserService userService;
     @Autowired
+    private ISysUserExtService userExtService;
+    @Autowired
     private ICustomersExtService customersExtService;
     @Autowired
     private IEsignPersonRealnVerifyService personRealnVerifyService;
@@ -210,4 +214,48 @@ public class WxPortalController extends ApiBaseController {
     }
 
 
+    @ApiOperation(value = "查询经销商人员列表", notes = "参数:{'userId':'XXXXXXX'}" +
+            "\n(userId:用户id)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params", paramType = "body")
+    })
+    @PostMapping("getDistributorList")
+    public Object getDistributorList() {
+        ParameterObject obj = getParameterObject();
+        obj.checkParameterNotNull("userId");
+        String userId = obj.getString("userId");
+        SysUserExt userExt = userExtService.selectSysUserExtById(Long.parseLong(userId));
+        if (userExt!=null){
+            if ("1".equals(userExt.getIsCustomerManager())){
+               List<SysUser> userList = userService.selectUserByOrgCode(userExt.getOrgCode());
+                return AjaxResult.success(userList);
+            }else{
+                return AjaxResult.error("不是负责人");
+            }
+        }else{
+            return AjaxResult.error("用户不存在");
+        }
+    }
+
+    @ApiOperation(value = "查询经销商人员列表", notes = "参数:{'userId':'XXXXXXX'}" +
+            "\n(userId:用户id)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params", paramType = "body")
+    })
+    @PostMapping("getDistributorList")
+    public Object updateUser() {
+        ParameterObject obj = getParameterObject();
+        obj.checkParameterNotNull("userId,IsConsignee");
+        String userId = obj.getString("userId");
+        String IsConsignee = obj.getString("IsConsignee");
+        SysUser user = new SysUser();
+        user.setUserId(Long.parseLong(userId));
+        user.setIsConsignee(IsConsignee);
+        int i = userService.updateUser(user);
+        if (i>0){
+            return AjaxResult.success("成功");
+        }else {
+            return AjaxResult.error("失败");
+        }
+    }
 }