Browse Source

修改付款邮件与站内消息

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
c025be181a

+ 1 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -984,7 +984,7 @@
   </select>
   <!-- 获得当前登录人的名字和部门名 -->
   <select id="getDeptNameByAid" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
-  	select a.name, d.name as departmentName,a.department_id departmentId,a.email from admin a
+  	select a.id,a.name, d.name as departmentName,a.department_id departmentId,a.email from admin a
   		left join department d on a.department_id = d.id
   		where a.id = #{_parameter,jdbcType=VARCHAR}
   </select>

+ 0 - 1
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
-import com.goafanti.common.model.FinancialPayment;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.utils.StringUtils;

+ 1 - 2
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -146,7 +146,6 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	public int addOrderPayment(TOrderPayment p) {
 		p.setStatus(0);
 		tOrderPaymentMapper.insertSelectiveGetId(p);
-		System.out.println(p.getId());
 		NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(p.getId());
 		AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		addNoticAndSendEmail(ni,a,NoticeStatus.PAYMENT_NODE.getCode());
@@ -171,7 +170,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(p.getId());
 		AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		addNoticAndSendEmail(ni,a,type);
-		PaymentLog pl=new PaymentLog(p.getId(),0,NoticeStatus.getValueByCode(type),a.getId(),a.getName());
+		PaymentLog pl=new PaymentLog(p.getId(),0,p.getRemarks(),a.getId(),a.getName());
 		paymentLogMapper.insertSelective(pl);
 		return tOrderPaymentMapper.updateByPrimaryKeySelective(p);
 	}