--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/member/service/FgMemberService.java

@@ -5,10 +5,49 @@ import com.zrqx.core.model.member.Member;
 import com.zrqx.core.service.BaseService;
 
 public interface FgMemberService  extends BaseService<Member, Integer> {
+	/**
+	 * 账号登录
+	 * @param account
+	 * @return
+	 */
 	Member login(String account);
+	/**
+	 * qq登录
+	 * @param qqKey
+	 * @return
+	 */
 	Member loginQQ(String qqKey);
+	/**
+	 * 微信登录
+	 * @param wechatKey
+	 * @return
+	 */
 	Member loginWechat(String wechatKey);
+	/**
+	 * 手机登录
+	 * @param phone
+	 * @return
+	 */
 	Member loginPhone(String phone);
+	/**
+	 * 判断用户 级别 查询所需的数据
+	 * @param m
+	 * @return
+	 */
 	LoginMemberInfo isLevel(Member m);
+	/**
+	 * 判断账号是否注册
+	 * @param id
+	 * @param account
+	 * @return
+	 */
 	boolean isExistByAccount(Integer id, String account);
+	/**
+	 * 修改余额
+	 * @param id
+	 * @param money
+	 * @return
+	 */
+	boolean balanceUpdate(Integer id, Double balance);
+
 }

com.zrqx.member/src/main/java/com/zrqx/member/fg/member/service/FgMemberServiceImpl.java

@@ -76,4 +76,11 @@ public class FgMemberServiceImpl  extends BaseServiceImpl<Member,Integer> implem
 		}
 		return info;
 	}
+	@Override
+	public boolean balanceUpdate(Integer id, Double balance) {
+		Member m = new Member();
+		m.setId(id);
+		m.setBalance(balance);
+		return mapper.updateByPrimaryKeySelective(m) > 0;
+	}
 }

com.zrqx.member/src/main/java/com/zrqx/member/fg/service/ServiceController.java

@@ -2,16 +2,26 @@ package com.zrqx.member.fg.service;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.zrqx.core.constant.member.MemberRequestPath;
+import com.zrqx.core.enums.member.ScoreEnum;
 import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.form.member.fg.service.BalanceUpdateForm;
+import com.zrqx.core.model.member.Member;
 import com.zrqx.core.model.member.Organ;
+import com.zrqx.core.model.member.PayInfo;
+import com.zrqx.core.util.datatype.DateUtils;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.member.fg.member.service.FgMemberService;
+import com.zrqx.member.fg.member.service.FgPayInfoService;
 import com.zrqx.member.fg.organ.service.FgOrganService;
 
 import io.swagger.annotations.Api;
@@ -26,17 +36,51 @@ public class ServiceController {
 	
 	private final static Logger logger = LoggerFactory.getLogger(ServiceController.class);
 	@Autowired
-	private FgOrganService oservice;
+	private FgOrganService oService;
+	@Autowired
+	private FgPayInfoService payService;
+	@Autowired
+	private FgMemberService mService;
 	
 	
 	@ApiOperation(value = "根据机构id查询机构的关联资源", notes = "0：成功；1：机构不存在；")
-	@PostMapping(value = MemberRequestPath.ORGAN_DIYTYPES)
+	@GetMapping(value = MemberRequestPath.ORGAN_DIYTYPES)
 	CallBack<String> getCurrentOrganByMember(@PathVariable("organId")Integer organId){
-		Organ organ = oservice.selectByPrimaryKey(organId);
+		Organ organ = oService.selectByPrimaryKey(organId);
 		if(organ == null) {
 			throw new BaseException(1,"机构不存在");
 		}
 		return CallBack.success(organ.getRelatedResourceTypes());
 		
 	}
+	
+	@ApiOperation(value = "余额充值 支付", notes = "0：成功；1：余额不足；2:支付类型错误;10：失败；")
+	@PostMapping(value =MemberRequestPath.UPDATE + MemberRequestPath.BALANCE)
+	CallBack<String> balanceUpdate(@RequestBody BalanceUpdateForm form){
+		synchronized(this) {
+			Member m = mService.selectByPrimaryKey(form.getMemberId());
+			Double balance;
+			if(ScoreEnum.PAY.getCode() == form.getScore()) {
+				if(form.getMoney() > m.getBalance()) {
+					throw new BaseException(1,"余额不足");
+				}
+				balance = m.getBalance() - form.getMoney();
+			}else if(ScoreEnum.RECHARGE.getCode() == form.getScore()) {
+				balance = form.getMoney()+m.getBalance();
+			}else {
+				throw new BaseException(2,"支付类型错误");
+			}
+			if(!mService.balanceUpdate(form.getMemberId(), balance)) {
+				throw new BaseException(10,"充值失败");
+			}
+			//添加消费记录
+			PayInfo payInfo = new PayInfo();
+			BeanUtils.copyProperties(form, payInfo);
+			payInfo.setAccount(m.getAccount());
+			payInfo.setBalance(balance);
+			payInfo.setCreateTime(DateUtils.getDate());
+			payService.insert(payInfo);
+		}
+		return CallBack.success();
+	}
 }